Skip to content

Commit 7c69e6c

Browse files
ilianagenkovailianagenkova
committed
MEDIT=5000 , satwhr=00505**,005099
1 parent 1f5e80b commit 7c69e6c

File tree

4 files changed

+348
-7
lines changed

4 files changed

+348
-7
lines changed

‎MESO_CLOSBF_changes

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
diff --git a/CHANGES b/CHANGES
2+
new file mode 100644
3+
index 0000000..2c56535
4+
--- /dev/null
5+
+++ b/CHANGES
6+
@@ -0,0 +1,2 @@
7+
+- change versions
8+
+- comment premature CLOSBF in b-d bufr_combfr.fd
9+
diff --git a/sorc/bufr_combfr.fd/combfr.f b/sorc/bufr_combfr.fd/combfr.f
10+
index f54540a..6e50cdf 100644
11+
--- a/sorc/bufr_combfr.fd/combfr.f
12+
+++ b/sorc/bufr_combfr.fd/combfr.f
13+
@@ -59,6 +59,7 @@ C 2013-01-24 D. KEYSER A FEW MINOR MODS; USE INTRINSIC "TRIM"
14+
C CHARACTER STRING FUNCTION TO ELIMINATE NEED TO OBTAIN NUMBER OF
15+
C NON-BLANK CHARACTERS IN STRINGS; REPLACED GETENV WITH MORE
16+
C STANDARD GET_ENVIRONMENT_VARIABLE.
17+
+C 2023-01-31 I. GENKOVA COMMENT OUT CALL TO CLOSBF BEFORE OPENBF
18+
C
19+
C USAGE:
20+
C INPUT FILES:
21+
@@ -122,7 +123,7 @@ C$$$
22+
23+
C----------------------------------------------------------------------
24+
C----------------------------------------------------------------------
25+
- CALL W3TAGB('BUFR_COMBFR',2013,0024,0053,'NP22')
26+
+ CALL W3TAGB('BUFR_COMBFR',2023,0024,0053,'NP22')
27+
28+
print *
29+
print * ,'---> Welcome to BUFR_COMBFR - Version 01-24-2013'
30+
@@ -212,7 +213,8 @@ C first input file that has an internal table and use this table)
31+
C ------------------------------------------------------------------
32+
33+
DO N=1,NFIL
34+
- CALL CLOSBF(LUNIN)
35+
+C NCO Bugzilla IG
36+
+C CALL CLOSBF(LUNIN)
37+
OPEN(LUNIN,FILE=TRIM(FILI(N)),FORM='UNFORMATTED')
38+
CALL OPENBF(LUNIN,'IN ',LUNIN)
39+
IF(IREADMG(LUNIN,SUBSET,IDATE)==0) THEN
40+
diff --git a/sorc/bufr_dupmar.fd/dupmar.f b/sorc/bufr_dupmar.fd/dupmar.f
41+
index 3fae9be..76a1491 100644
42+
--- a/sorc/bufr_dupmar.fd/dupmar.f
43+
+++ b/sorc/bufr_dupmar.fd/dupmar.f
44+
@@ -224,8 +224,11 @@ C VALUE BMISS AS REAL*8 TO GET A RELIABLE VALUE FOR BMISS IN PRINT
45+
C STATEMENTS
46+
C 2020-08-20 J. DONG ADDED SETBMISS CALL TO SET BMISS TO 10E8 AND
47+
C CHANGE THE CODE TO AVOID INTEGER OVERFLOW
48+
-C 2022-03-25 I. Genkova Added check for 0 reports in input file and
49+
-C allows for graceful continue in the event of 0 reports.
50+
+C 2022-03-25 I. GENKOVA ADDED CHECK FOR 0 REPORTS IN INPUT FILE AND
51+
+C ALLOWS CODE TO GRACEFULLY CONTINUE IN THE EVENT
52+
+C OF 0 (ZERO) REPORTS
53+
+C 2023-01-31 I. GENKOVA ADD CHECK TO MAKE SURE THE UFBMEM SPACE IS
54+
+C BIG ENOUGH FOR FILI (FIXES MSONET SIGSEGV ERROR)
55+
C
56+
C USAGE:
57+
C INPUT FILES:
58+
@@ -341,12 +344,19 @@ C$$$
59+
60+
C-----------------------------------------------------------------------
61+
C-----------------------------------------------------------------------
62+
- CALL W3TAGB('BUFR_DUPMAR',2022,0084,0062,'NP22')
63+
+ CALL W3TAGB('BUFR_DUPMAR',2023,0084,0062,'NP22')
64+
65+
print *
66+
print * ,'---> Welcome to BUFR_DUPMAR - Version 03-25-2022'
67+
print *
68+
69+
+C MAKE SURE THE UFBMEM SPACE IS BIG ENOUGH FOR FILI (msonet fix)
70+
+C -------------------------------------------------------------
71+
+ READ(5,'(A)',END=900,ERR=900) FILI
72+
+ INQUIRE(FILE=FILI,SIZE=nsize)
73+
+ if (igetprm('MAXMEM')<nsize) CALL ISETPRM('MAXMEM',nsize)
74+
+
75+
+
76+
CALL DATELEN(10)
77+
78+
ccccc CALL OPENBF(0,'QUIET',2) ! Uncomment for extra print from bufrlib
79+
diff --git a/versions/VERSION b/versions/VERSION
80+
index 45a1b3f..26aaba0 100644
81+
--- a/versions/VERSION
82+
+++ b/versions/VERSION
83+
@@ -1 +1 @@
84+
-1.1.2
85+
+1.2.0

‎SDMEDIt_differences

+253
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,253 @@
1+
diff --git a/CHANGES b/CHANGES
2+
deleted file mode 100644
3+
index 2c56535..0000000
4+
--- a/CHANGES
5+
+++ /dev/null
6+
@@ -1,2 +0,0 @@
7+
-- change versions
8+
-- comment premature CLOSBF in b-d bufr_combfr.fd
9+
diff --git a/MESO_CLOSBF_changes b/MESO_CLOSBF_changes
10+
new file mode 100644
11+
index 0000000..870a6de
12+
--- /dev/null
13+
+++ b/MESO_CLOSBF_changes
14+
@@ -0,0 +1,85 @@
15+
+diff --git a/CHANGES b/CHANGES
16+
+new file mode 100644
17+
+index 0000000..2c56535
18+
+--- /dev/null
19+
++++ b/CHANGES
20+
+@@ -0,0 +1,2 @@
21+
++- change versions
22+
++- comment premature CLOSBF in b-d bufr_combfr.fd
23+
+diff --git a/sorc/bufr_combfr.fd/combfr.f b/sorc/bufr_combfr.fd/combfr.f
24+
+index f54540a..6e50cdf 100644
25+
+--- a/sorc/bufr_combfr.fd/combfr.f
26+
++++ b/sorc/bufr_combfr.fd/combfr.f
27+
+@@ -59,6 +59,7 @@ C 2013-01-24 D. KEYSER A FEW MINOR MODS; USE INTRINSIC "TRIM"
28+
+ C CHARACTER STRING FUNCTION TO ELIMINATE NEED TO OBTAIN NUMBER OF
29+
+ C NON-BLANK CHARACTERS IN STRINGS; REPLACED GETENV WITH MORE
30+
+ C STANDARD GET_ENVIRONMENT_VARIABLE.
31+
++C 2023-01-31 I. GENKOVA COMMENT OUT CALL TO CLOSBF BEFORE OPENBF
32+
+ C
33+
+ C USAGE:
34+
+ C INPUT FILES:
35+
+@@ -122,7 +123,7 @@ C$$$
36+
+
37+
+ C----------------------------------------------------------------------
38+
+ C----------------------------------------------------------------------
39+
+- CALL W3TAGB('BUFR_COMBFR',2013,0024,0053,'NP22')
40+
++ CALL W3TAGB('BUFR_COMBFR',2023,0024,0053,'NP22')
41+
+
42+
+ print *
43+
+ print * ,'---> Welcome to BUFR_COMBFR - Version 01-24-2013'
44+
+@@ -212,7 +213,8 @@ C first input file that has an internal table and use this table)
45+
+ C ------------------------------------------------------------------
46+
+
47+
+ DO N=1,NFIL
48+
+- CALL CLOSBF(LUNIN)
49+
++C NCO Bugzilla IG
50+
++C CALL CLOSBF(LUNIN)
51+
+ OPEN(LUNIN,FILE=TRIM(FILI(N)),FORM='UNFORMATTED')
52+
+ CALL OPENBF(LUNIN,'IN ',LUNIN)
53+
+ IF(IREADMG(LUNIN,SUBSET,IDATE)==0) THEN
54+
+diff --git a/sorc/bufr_dupmar.fd/dupmar.f b/sorc/bufr_dupmar.fd/dupmar.f
55+
+index 3fae9be..76a1491 100644
56+
+--- a/sorc/bufr_dupmar.fd/dupmar.f
57+
++++ b/sorc/bufr_dupmar.fd/dupmar.f
58+
+@@ -224,8 +224,11 @@ C VALUE BMISS AS REAL*8 TO GET A RELIABLE VALUE FOR BMISS IN PRINT
59+
+ C STATEMENTS
60+
+ C 2020-08-20 J. DONG ADDED SETBMISS CALL TO SET BMISS TO 10E8 AND
61+
+ C CHANGE THE CODE TO AVOID INTEGER OVERFLOW
62+
+-C 2022-03-25 I. Genkova Added check for 0 reports in input file and
63+
+-C allows for graceful continue in the event of 0 reports.
64+
++C 2022-03-25 I. GENKOVA ADDED CHECK FOR 0 REPORTS IN INPUT FILE AND
65+
++C ALLOWS CODE TO GRACEFULLY CONTINUE IN THE EVENT
66+
++C OF 0 (ZERO) REPORTS
67+
++C 2023-01-31 I. GENKOVA ADD CHECK TO MAKE SURE THE UFBMEM SPACE IS
68+
++C BIG ENOUGH FOR FILI (FIXES MSONET SIGSEGV ERROR)
69+
+ C
70+
+ C USAGE:
71+
+ C INPUT FILES:
72+
+@@ -341,12 +344,19 @@ C$$$
73+
+
74+
+ C-----------------------------------------------------------------------
75+
+ C-----------------------------------------------------------------------
76+
+- CALL W3TAGB('BUFR_DUPMAR',2022,0084,0062,'NP22')
77+
++ CALL W3TAGB('BUFR_DUPMAR',2023,0084,0062,'NP22')
78+
+
79+
+ print *
80+
+ print * ,'---> Welcome to BUFR_DUPMAR - Version 03-25-2022'
81+
+ print *
82+
+
83+
++C MAKE SURE THE UFBMEM SPACE IS BIG ENOUGH FOR FILI (msonet fix)
84+
++C -------------------------------------------------------------
85+
++ READ(5,'(A)',END=900,ERR=900) FILI
86+
++ INQUIRE(FILE=FILI,SIZE=nsize)
87+
++ if (igetprm('MAXMEM')<nsize) CALL ISETPRM('MAXMEM',nsize)
88+
++
89+
++
90+
+ CALL DATELEN(10)
91+
+
92+
+ ccccc CALL OPENBF(0,'QUIET',2) ! Uncomment for extra print from bufrlib
93+
+diff --git a/versions/VERSION b/versions/VERSION
94+
+index 45a1b3f..26aaba0 100644
95+
+--- a/versions/VERSION
96+
++++ b/versions/VERSION
97+
+@@ -1 +1 @@
98+
+-1.1.2
99+
++1.2.0
100+
diff --git a/fix/bufr_dumplist b/fix/bufr_dumplist
101+
index 708c623..bacb836 100644
102+
--- a/fix/bufr_dumplist
103+
+++ b/fix/bufr_dumplist
104+
@@ -60,8 +60,8 @@ _004 mgt 004001 004002 004003 004004 004005 004006 004007 004008 004009 00
105+
106+
--> Single-level upper-air data (satellite) -- TYPE 005
107+
---------------------------------------------------
108+
-_sluas nem 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091
109+
-_005 mgt 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091
110+
+_sluas nem 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005052 005053 005054 005055 005056 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091 005099
111+
+_005 mgt 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005052 005053 005054 005055 005056 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091 005099
112+
113+
--> Radar data -- TYPE 006
114+
----------------------
115+
@@ -149,6 +149,7 @@ _avcl18 nem 021054
116+
_shpall nem 001001 001013
117+
_satmar nem 031104 031106 031110 031112 031113 031114 031115 031117 031118 031119 031120 031121 031122 031123 031124 031125 031126 031127 031130
118+
_gmi1cr nem 021246
119+
+_satwhr nem 005052 005053 005054 005055 005056 005099
120+
121+
===================================================================================================================================
122+
123+
diff --git a/sorc/bufr_combfr.fd/combfr.f b/sorc/bufr_combfr.fd/combfr.f
124+
index 6e50cdf..f54540a 100644
125+
--- a/sorc/bufr_combfr.fd/combfr.f
126+
+++ b/sorc/bufr_combfr.fd/combfr.f
127+
@@ -59,7 +59,6 @@ C 2013-01-24 D. KEYSER A FEW MINOR MODS; USE INTRINSIC "TRIM"
128+
C CHARACTER STRING FUNCTION TO ELIMINATE NEED TO OBTAIN NUMBER OF
129+
C NON-BLANK CHARACTERS IN STRINGS; REPLACED GETENV WITH MORE
130+
C STANDARD GET_ENVIRONMENT_VARIABLE.
131+
-C 2023-01-31 I. GENKOVA COMMENT OUT CALL TO CLOSBF BEFORE OPENBF
132+
C
133+
C USAGE:
134+
C INPUT FILES:
135+
@@ -123,7 +122,7 @@ C$$$
136+
137+
C----------------------------------------------------------------------
138+
C----------------------------------------------------------------------
139+
- CALL W3TAGB('BUFR_COMBFR',2023,0024,0053,'NP22')
140+
+ CALL W3TAGB('BUFR_COMBFR',2013,0024,0053,'NP22')
141+
142+
print *
143+
print * ,'---> Welcome to BUFR_COMBFR - Version 01-24-2013'
144+
@@ -213,8 +212,7 @@ C first input file that has an internal table and use this table)
145+
C ------------------------------------------------------------------
146+
147+
DO N=1,NFIL
148+
-C NCO Bugzilla IG
149+
-C CALL CLOSBF(LUNIN)
150+
+ CALL CLOSBF(LUNIN)
151+
OPEN(LUNIN,FILE=TRIM(FILI(N)),FORM='UNFORMATTED')
152+
CALL OPENBF(LUNIN,'IN ',LUNIN)
153+
IF(IREADMG(LUNIN,SUBSET,IDATE)==0) THEN
154+
diff --git a/sorc/bufr_dupmar.fd/dupmar.f b/sorc/bufr_dupmar.fd/dupmar.f
155+
index 76a1491..3fae9be 100644
156+
--- a/sorc/bufr_dupmar.fd/dupmar.f
157+
+++ b/sorc/bufr_dupmar.fd/dupmar.f
158+
@@ -224,11 +224,8 @@ C VALUE BMISS AS REAL*8 TO GET A RELIABLE VALUE FOR BMISS IN PRINT
159+
C STATEMENTS
160+
C 2020-08-20 J. DONG ADDED SETBMISS CALL TO SET BMISS TO 10E8 AND
161+
C CHANGE THE CODE TO AVOID INTEGER OVERFLOW
162+
-C 2022-03-25 I. GENKOVA ADDED CHECK FOR 0 REPORTS IN INPUT FILE AND
163+
-C ALLOWS CODE TO GRACEFULLY CONTINUE IN THE EVENT
164+
-C OF 0 (ZERO) REPORTS
165+
-C 2023-01-31 I. GENKOVA ADD CHECK TO MAKE SURE THE UFBMEM SPACE IS
166+
-C BIG ENOUGH FOR FILI (FIXES MSONET SIGSEGV ERROR)
167+
+C 2022-03-25 I. Genkova Added check for 0 reports in input file and
168+
+C allows for graceful continue in the event of 0 reports.
169+
C
170+
C USAGE:
171+
C INPUT FILES:
172+
@@ -344,19 +341,12 @@ C$$$
173+
174+
C-----------------------------------------------------------------------
175+
C-----------------------------------------------------------------------
176+
- CALL W3TAGB('BUFR_DUPMAR',2023,0084,0062,'NP22')
177+
+ CALL W3TAGB('BUFR_DUPMAR',2022,0084,0062,'NP22')
178+
179+
print *
180+
print * ,'---> Welcome to BUFR_DUPMAR - Version 03-25-2022'
181+
print *
182+
183+
-C MAKE SURE THE UFBMEM SPACE IS BIG ENOUGH FOR FILI (msonet fix)
184+
-C -------------------------------------------------------------
185+
- READ(5,'(A)',END=900,ERR=900) FILI
186+
- INQUIRE(FILE=FILI,SIZE=nsize)
187+
- if (igetprm('MAXMEM')<nsize) CALL ISETPRM('MAXMEM',nsize)
188+
-
189+
-
190+
CALL DATELEN(10)
191+
192+
ccccc CALL OPENBF(0,'QUIET',2) ! Uncomment for extra print from bufrlib
193+
diff --git a/sorc/bufr_edtbfr.fd/edtbfr.f b/sorc/bufr_edtbfr.fd/edtbfr.f
194+
index ddc1452..2cc981c 100644
195+
--- a/sorc/bufr_edtbfr.fd/edtbfr.f
196+
+++ b/sorc/bufr_edtbfr.fd/edtbfr.f
197+
@@ -230,7 +230,8 @@ C WMO bulletin header). These no longer match.
198+
C 2020-08-20 J. DONG ADDED SETBMISS CALL TO SET BMISS TO 10E8 AND
199+
C CHANGE THE CODE TO FIX FLOATING INVALID ERROR.
200+
C 2021-09-02 D. STOKES -- COMMENTED SYSTEM CALLS OF POSTMSG TO JLOGFILE
201+
-C 2022-08-15 I. GENKOVA -- INCREASED MEDT SIZE TO ACCOMODATE SDMEDIT
202+
+C 2022-08-15 I. GENKOVA -- INCREASED MEDT=5000 TO ALLOW 5000 STATIONS
203+
+C OF ONE TYPE IN SDMEDIT FILE
204+
C
205+
C USAGE
206+
C INPUT FILES:
207+
@@ -651,7 +652,7 @@ C
208+
C$$$
209+
PROGRAM BUFR_EDTBFR
210+
211+
- PARAMETER (MEDT=2000) ! Allows up to 2000 time- and report
212+
+ PARAMETER (MEDT=5000) ! Allows up to 5000 time- and report
213+
! type-relevant entries in the
214+
! SDMEDIT flag file
215+
PARAMETER (MXTS=10)
216+
@@ -860,10 +861,11 @@ C$$$
217+
218+
C-----------------------------------------------------------------------
219+
C-----------------------------------------------------------------------
220+
- CALL W3TAGB('BUFR_EDTBFR',2022,0227,1100,'NP22')
221+
+ CALL W3TAGB('BUFR_EDTBFR',2023,0321,1100,'NP22')
222+
223+
print *
224+
print * ,'---> Welcome to BUFR_EDTBFR - Version 09-02-2021'
225+
+ print * ,'IG: MEDT=5000'
226+
print *
227+
228+
C ASSIGN DEFAULT VALUE FOR 'MISSING' TO LOCAL BMISS VARIABLE
229+
@@ -2168,7 +2170,7 @@ C
230+
C$$$
231+
SUBROUTINE APPLY(LUBFJ,CARD,M,ITYP,JTYP,LPRINT)
232+
233+
- PARAMETER (MEDT=2000) ! Allows up to 2000 time- and report type-
234+
+ PARAMETER (MEDT=5000) ! Allows up to 5000 time- and report type-
235+
! relevant entries in the SDMEDIT flag file
236+
237+
CHARACTER*128 CARD
238+
@@ -2686,7 +2688,7 @@ C
239+
C$$$
240+
SUBROUTINE PRSRNG(CARD,M,IER)
241+
242+
- PARAMETER (MEDT=2000) ! Allows up to 2000 time- and report type-
243+
+ PARAMETER (MEDT=5000) ! Allows up to 5000 time- and report type-
244+
! relevant entries in the SDMEDIT flag file
245+
246+
CHARACTER*128 CARD
247+
diff --git a/versions/VERSION b/versions/VERSION
248+
index 26aaba0..45a1b3f 100644
249+
--- a/versions/VERSION
250+
+++ b/versions/VERSION
251+
@@ -1 +1 @@
252+
-1.2.0
253+
+1.1.2

‎fix/bufr_dumplist

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,8 @@ _004 mgt 004001 004002 004003 004004 004005 004006 004007 004008 004009 00
6060

6161
--> Single-level upper-air data (satellite) -- TYPE 005
6262
---------------------------------------------------
63-
_sluas nem 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091
64-
_005 mgt 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091
63+
_sluas nem 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005052 005053 005054 005055 005056 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091 005099
64+
_005 mgt 005008 005013 005021 005022 005023 005030 005031 005032 005034 005039 005044 005045 005046 005050 005051 005052 005053 005054 005055 005056 005064 005065 005066 005067 005068 005069 005070 005071 005072 005080 005081 005091 005099
6565

6666
--> Radar data -- TYPE 006
6767
----------------------
@@ -149,6 +149,7 @@ _avcl18 nem 021054
149149
_shpall nem 001001 001013
150150
_satmar nem 031104 031106 031110 031112 031113 031114 031115 031117 031118 031119 031120 031121 031122 031123 031124 031125 031126 031127 031130
151151
_gmi1cr nem 021246
152+
_satwhr nem 005052 005053 005054 005055 005056 005099
152153

153154
===================================================================================================================================
154155

0 commit comments

Comments
 (0)