Skip to content

Commit e7f9c12

Browse files
sdrabenhsdrabenh
authored
Merge pull request #118 from GEOS-ESM/feature/ltakacs/TEM_Diag_Updates_for_ALL_Times_20241108_patch_20250122
Patch to fix EXPIDs containing underscores
2 parents b74983d + d5e3a54 commit e7f9c12

File tree

6 files changed

+132
-82
lines changed

6 files changed

+132
-82
lines changed

‎.circleci/config.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
version: 2.1
22

33
# Anchors in case we need to override the defaults from the orb
4-
#baselibs_version: &baselibs_version v7.23.0
5-
#bcs_version: &bcs_version v11.5.0
4+
#baselibs_version: &baselibs_version v7.29.0
5+
#bcs_version: &bcs_version v11.6.0
66

77
orbs:
8-
ci: geos-esm/circleci-tools@2
8+
ci: geos-esm/circleci-tools@4
99

1010
workflows:
1111
build-test:

‎plots/grads_util/fixname.gs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ alias = ""
2424
i = 1
2525
while ( i<=length )
2626
bit = substr(DESC,i,1)
27-
* if( bit != "_" & bit != "-" )
27+
if( bit != "_" & bit != "-" )
2828
alias = alias % bit
29-
* endif
29+
endif
3030
i = i+1
3131
endwhile
3232
DESC = alias

‎plots/grads_util/gencmp.gs‎

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ if( subwrd(args,num) = '-NAME' ) ; NAME = subwrd(args,num+1) ; endif
2424
if( subwrd(args,num) = '-STAT' ) ; STAT = subwrd(args,num+1) ; endif
2525
if( subwrd(args,num) = '-LEVEL' ) ; LEVEL = subwrd(args,num+1) ; endif
2626

27+
'fixname 'EXPID
28+
EXPIDa = result
29+
2730
* Read EXPORTS with format EXPORT:GC[:OPT]
2831
* -----------------------------------------
2932
if( subwrd(args,num) = '-EXPORT' )
@@ -214,9 +217,9 @@ endif
214217
* -------------------------------------------------
215218
'setdates'
216219
'run getenv "BEGDATE"'
217-
begdate.EXPID = result
220+
begdate.EXPIDa = result
218221
'run getenv "ENDDATE"'
219-
enddate.EXPID = result
222+
enddate.EXPIDa = result
220223
'sett'
221224

222225
* Ensure NAME has no underscores
@@ -238,13 +241,19 @@ endwhile
238241
* ---------------------------------
239242
say ' '
240243
'q dims'
241-
say 'Model Environment:'
244+
say 'Model Environment: '
245+
say ' mexp: 'mexp
242246
say result
243247

244248
if( mexp = 1 )
245249
NAME = EXPORT.1
246250
GC = GC.1
247251
EXPORT = EXPORT.1
252+
253+
say ' NAME: 'NAME
254+
say ' GC: 'GC
255+
say 'EXPORT: 'EXPORT
256+
248257
if( qname.1 != alias.1 )
249258
'seasonalf -FUNCTION 'alias.1''qfile.1'*'qscale.1' -NAME 'mod
250259
else
@@ -287,13 +296,13 @@ if( STAT = "STD" | STAT = "RMS" | STAT = "BIAS" )
287296
endif
288297

289298
'run getenv "CLIMATE"'
290-
climate.EXPID = result
299+
climate.EXPIDa = result
291300

292301
say ''
293302
say ' EXPID = 'EXPID
294-
say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPID
295-
say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPID
296-
say 'climate.EXPID => climate.'EXPID' = 'climate.EXPID
303+
say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPIDa
304+
say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPIDa
305+
say 'climate.EXPID => climate.'EXPID' = 'climate.EXPIDa
297306
say ''
298307

299308
***********************************************************************************
@@ -380,6 +389,8 @@ while ( m <= numGCs )
380389

381390
say "Looping CMPEXPs, numexp = "numexp" oname."numexp" = "oname.numexp.m" obsnam."numexp" = "obsnam.numexp.m" numGCS = "numGCs
382391
cmpname = obsnam.numexp.m
392+
'run fixname 'cmpname
393+
cmpnama = result
383394
say
384395
if( STAT = "STD" )
385396
oname.numexp.m = 'VAR_'oname.numexp.m
@@ -428,11 +439,11 @@ if( found = "TRUE" )
428439
obslev = result
429440

430441
'getdates'
431-
begdate.cmpname = subwrd(result,1)
432-
enddate.cmpname = subwrd(result,2)
442+
begdate.cmpnama = subwrd(result,1)
443+
enddate.cmpnama = subwrd(result,2)
433444

434-
say 'begdate.cmpname: begdate.'cmpname' = 'begdate.cmpname
435-
say 'enddate.cmpname: enddate.'cmpname' = 'enddate.cmpname
445+
say 'begdate.cmpname: begdate.'cmpname' = 'begdate.cmpnama
446+
say 'enddate.cmpname: enddate.'cmpname' = 'enddate.cmpnama
436447

437448
* 'run setenv "BEGDATEO" 'begdate.numexp
438449
* 'run setenv "ENDDATEO" 'enddate.numexp
@@ -494,7 +505,7 @@ endif
494505
* Compute CLIMATOLOGY Flag for Comparison Experiment
495506
* --------------------------------------------------
496507
'run getenv "CLIMATE"'
497-
climate.cmpname = result
508+
climate.cmpnama = result
498509
anafile = obsfile.numexp.1
499510
anadsc = obsdsc.numexp.1
500511
ananam = obsnam.numexp.1
@@ -508,16 +519,16 @@ endif
508519
k = k+1
509520

510521
'set dfile 'qfile.1
511-
say 'count "'season'" 'begdate.EXPID' 'enddate.EXPID
512-
'count "'season'" 'begdate.EXPID' 'enddate.EXPID
522+
say 'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
523+
'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
513524
nmod = result
514-
say 'climate.EXPID = 'climate.EXPID
525+
say 'climate.EXPID = 'climate.EXPIDa
515526
516527
'set dfile 'anafile
517-
say 'count "'season'" 'begdate.cmpname' 'enddate.cmpname
518-
'count "'season'" 'begdate.cmpname' 'enddate.cmpname
528+
say 'count "'season'" 'begdate.cmpnama' 'enddate.cmpnama
529+
'count "'season'" 'begdate.cmpnama' 'enddate.cmpnama
519530
nobs.numexp = result
520-
say 'climate.cmpname = 'climate.cmpname
531+
say 'climate.cmpname = 'climate.cmpnama
521532

522533
if( STAT = "STD" | STAT = "RMS" | STAT = "BIAS" )
523534
'define obs'numexp''season' = sqrt( obs'numexp''season' )'
@@ -526,7 +537,7 @@ endif
526537

527538
flag = ""
528539
while ( flag = "" )
529-
'run genplt.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'alias.1' -SEASON 'season' -MBDATE 'begdate.EXPID' -MEDATE 'enddate.EXPID' -CLIMEXP 'climate.EXPID' -CBDATE 'begdate.cmpname' -CEDATE 'enddate.cmpname' -CLIMCMP 'climate.cmpname' -OUTPUT 'OUTPUT' -LEVEL 'LEVEL' -NMOD 'nmod' -CMOD 'nobs.numexp' -MFILE 'qfile.1' -CFILE 'anafile' -CNAME 'ananam' -CDESC 'anadsc' -DEBUG 'DEBUG' -MDESC 'qdesc.1' -STAT 'STAT
540+
'run genplt.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'alias.1' -SEASON 'season' -MBDATE 'begdate.EXPIDa' -MEDATE 'enddate.EXPIDa' -CLIMEXP 'climate.EXPIDa' -CBDATE 'begdate.cmpnama' -CEDATE 'enddate.cmpnama' -CLIMCMP 'climate.cmpnama' -OUTPUT 'OUTPUT' -LEVEL 'LEVEL' -NMOD 'nmod' -CMOD 'nobs.numexp' -MFILE 'qfile.1' -CFILE 'anafile' -CNAME 'ananam' -CDESC 'anadsc' -DEBUG 'DEBUG' -MDESC 'qdesc.1' -STAT 'STAT
530541
if( DEBUG = "debug" )
531542
say "Hit ENTER to repeat plot"
532543
say "Type 'next' for next plot, 'done' for next field"
@@ -609,11 +620,15 @@ else
609620
say ''
610621
cmpnam = ctag.n
611622
obsnam = ctag.TAG
623+
'run fixname 'cmpnam
624+
cmpnamf = result
625+
'run fixname 'obsnam
626+
obsnamf = result
612627

613628
say ' cmpnam: 'cmpnam
614629
say ' obsnam: 'obsnam
615-
say ' climate.cmpnam: 'climate.cmpnam
616-
say ' climate.obsnam: 'climate.obsnam
630+
say ' climate.cmpnam: 'climate.cmpnamf
631+
say ' climate.obsnam: 'climate.obsnamf
617632

618633
flag = ""
619634
while ( flag = "" )
@@ -622,7 +637,7 @@ else
622637
'define zobs'n''season' = regrid2( obs'n''season' ,0.25,0.25,bs_p1,0,-90 )'
623638
'define zmod'season' = regrid2( mod'season' ,0.25,0.25,bs_p1,0,-90 )'
624639

625-
'closeness -CVAR 'zobs''n' -MVAR 'zmod' -OVAR 'zobs''TAG' -CNAME 'ctag.n' -MNAME 'EXPORT' -ALIAS 'alias.1' -ONAME 'ctag.TAG' -CDESC 'obsdsc.n.1' -MDESC 'qdesc.1' -ODESC 'obsdsc.TAG.1' -MFILE 'qfile.1' -MBEGDATE 'begdate.EXPID' -MENDDATE 'enddate.EXPID' -OFILE 'obsfile.TAG.1' -OBEGDATE 'begdate.obsnam' -OENDDATE 'enddate.obsnam' -EXPID 'EXPID' -PREFIX 'NULL' -SEASON 'season' -OUTPUT 'OUTPUT' -CLIMEXP 'climate.EXPID' -CLIMCMP 'climate.cmpnam' -CLIMOBS 'climate.obsnam' -GC 'GC.1' -MATH 'NULL' -LEVEL 'LEVEL
640+
'closeness -CVAR 'zobs''n' -MVAR 'zmod' -OVAR 'zobs''TAG' -CNAME 'ctag.n' -MNAME 'EXPORT' -ALIAS 'alias.1' -ONAME 'ctag.TAG' -CDESC 'obsdsc.n.1' -MDESC 'qdesc.1' -ODESC 'obsdsc.TAG.1' -MFILE 'qfile.1' -MBEGDATE 'begdate.EXPIDa' -MENDDATE 'enddate.EXPIDa' -OFILE 'obsfile.TAG.1' -OBEGDATE 'begdate.obsnamf' -OENDDATE 'enddate.obsnamf' -EXPID 'EXPID' -PREFIX 'NULL' -SEASON 'season' -OUTPUT 'OUTPUT' -CLIMEXP 'climate.EXPIDa' -CLIMCMP 'climate.cmpnamf' -CLIMOBS 'climate.obsnamf' -GC 'GC.1' -MATH 'NULL' -LEVEL 'LEVEL
626641

627642
'myprint -name 'OUTPUT'/hdiag_'ctag.n'_'NAME'.'GC.1'_'LEVEL'_closeness_'ctag.TAG'.'season
628643

‎plots/grads_util/gencmpz.gs‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ if( subwrd(args,num) = '-NAME' ) ; NAME = subwrd(args,num+1) ; endif
2424
if( subwrd(args,num) = '-DEBUG' ) ; DEBUG = subwrd(args,num+1) ; endif
2525
if( subwrd(args,num) = '-STAT' ) ; STAT = subwrd(args,num+1) ; endif
2626

27+
'run fixname 'EXPID
28+
EXPIDa = result
29+
2730
* Read PTOP
2831
* ---------
2932
if( subwrd(args,num) = '-PTOP' )
@@ -131,7 +134,6 @@ endwhile
131134
'set csmooth on'
132135
'set clab off'
133136
'c'
134-
'rgbset'
135137

136138
'run uppercase 'seasons
137139
seasons = result
@@ -243,9 +245,9 @@ endwhile
243245
'setdates'
244246

245247
'run getenv "BEGDATE"'
246-
begdate.EXPID = result
248+
begdate.EXPIDa = result
247249
'run getenv "ENDDATE"'
248-
enddate.EXPID = result
250+
enddate.EXPIDa = result
249251

250252
'setlons'
251253
'sety'
@@ -327,13 +329,13 @@ else
327329
endif
328330

329331
'run getenv "CLIMATE"'
330-
climate.EXPID = result
332+
climate.EXPIDa = result
331333

332334
say ''
333335
say ' EXPID = 'EXPID
334-
say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPID
335-
say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPID
336-
say 'climate.EXPID => climate.'EXPID' = 'climate.EXPID
336+
say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPIDa
337+
say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPIDa
338+
say 'climate.EXPID => climate.'EXPID' = 'climate.EXPIDa
337339
say ''
338340

339341
*******************************************************************
@@ -426,6 +428,8 @@ if( STAT = "RMS" | STAT = "BIAS" )
426428
oexp = oexp + 1
427429
endif
428430
CMPID = obsnam.1
431+
'run fixname 'CMPID
432+
CMPIDa = result
429433

430434

431435
* Continue if all EXPORT(s) are found
@@ -434,8 +438,8 @@ if( found = "TRUE" )
434438

435439
'set dfile 'ofile.1
436440
'getdates'
437-
begdate.CMPID = subwrd(result,1)
438-
enddate.CMPID = subwrd(result,2)
441+
begdate.CMPIDa = subwrd(result,1)
442+
enddate.CMPIDa = subwrd(result,2)
439443

440444
'set lon 'lonmin' 'lonmax
441445
'set lat 'latmin' 'latmax
@@ -514,15 +518,15 @@ endif
514518
say 'Processing Season: 'season
515519

516520
'set dfile 'mfile.1
517-
'count "'season'" 'begdate.EXPID' 'enddate.EXPID
521+
'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
518522
nmod = result
519523

520524
'set dfile 'ofile.1
521-
'count "'season'" 'begdate.CMPID' 'enddate.CMPID
525+
'count "'season'" 'begdate.CMPIDa' 'enddate.CMPIDa
522526
nobs = result
523527

524528
'run getenv "CLIMATE"'
525-
climate.CMPID = result
529+
climate.CMPIDa = result
526530

527531
* Set EXPORT Model and Observation Scaling Factors
528532
* ------------------------------------------------
@@ -565,6 +569,7 @@ endif
565569

566570
* Make ZPLT
567571
* ---------
572+
'rgbset'
568573
n = 1
569574
while( n<=NPTOPS )
570575

@@ -600,7 +605,7 @@ while( n<=NPTOPS )
600605
flag = ""
601606
while ( flag = "" )
602607

603-
'run genpltz.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'mname.1' -QFILE 'mfile.1' -OFILE 'ofile.1' -ONAME 'CMPID' -OBDATE 'begdate.CMPID' -OEDATE 'enddate.CMPID' -NMOD 'nmod' -NOBS 'nobs' -QDESC 'expdsc.1' -ODESC 'obsdsc.1' -OUTPUT 'OUTPUT' -SEASON 'season' -PTOP 'PTOP' -MAX 'qmax' -MIN 'qmin' -ZLOG 'ZLOG' -STAT 'STAT' -CLIMEXP 'climate.EXPID' -CLIMCMP 'climate.CMPID' -MBDATE 'begdate.EXPID' -MEDATE 'enddate.EXPID
608+
'run genpltz.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'mname.1' -QFILE 'mfile.1' -OFILE 'ofile.1' -ONAME 'CMPID' -OBDATE 'begdate.CMPIDa' -OEDATE 'enddate.CMPIDa' -NMOD 'nmod' -NOBS 'nobs' -QDESC 'expdsc.1' -ODESC 'obsdsc.1' -OUTPUT 'OUTPUT' -SEASON 'season' -PTOP 'PTOP' -MAX 'qmax' -MIN 'qmin' -ZLOG 'ZLOG' -STAT 'STAT' -CLIMEXP 'climate.EXPIDa' -CLIMCMP 'climate.CMPIDa' -MBDATE 'begdate.EXPIDa' -MEDATE 'enddate.EXPIDa
604609

605610
if( DEBUG = "debug" )
606611
say "Hit ENTER to repeat plot"

0 commit comments

Comments
 (0)