plot bug fixes

CHANGELOG.md

@@ -13,6 +13,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Edited gcmpost.script to move up the location of $SOURCE/plot/.quickplotrc to restore missing plots from landscape.list for some users.
+- Corrected LWP plot command in portrait.script to only include LWP not CCWP
+- Corrected an issue where tags like ":V" after cmp exps were resulting in "ctag" showing up in filenames and labels for some plots
+- Fixed incorrect labeling of model data as actual or climatological in some plots
+- Updated makplotz to prevent blank or fake zonal line plots from being created
+
 ### Removed
 
 ### Deprecated

plots/grads_util/gencmp.gs

@@ -217,9 +217,9 @@ endif
 * -------------------------------------------------
 'setdates'
 'run getenv "BEGDATE"'
-             begdate.EXPIDa = result
+             begdate = result
 'run getenv "ENDDATE"'
-             enddate.EXPIDa = result
+             enddate = result
 'sett'
 
 * Ensure NAME has no underscores
@@ -296,13 +296,13 @@ if( STAT = "STD" | STAT = "RMS" | STAT = "BIAS" )
 endif
 
 'run getenv "CLIMATE"'
-             climate.EXPIDa = result
+             climexp = result
 
 say ''
 say '        EXPID = 'EXPID
-say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPIDa
-say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPIDa
-say 'climate.EXPID => climate.'EXPID' = 'climate.EXPIDa
+say 'begdate = 'begdate
+say 'enddate = 'enddate
+say 'climexp = 'climexp
 say ''
 
 ***********************************************************************************
@@ -439,11 +439,11 @@ if( found = "TRUE" )
                      obslev = result
 
            'getdates'
-            begdate.cmpnama = subwrd(result,1)
-            enddate.cmpnama = subwrd(result,2)
+            begdate.numexp = subwrd(result,1)
+            enddate.numexp = subwrd(result,2)
 
-            say 'begdate.cmpname: begdate.'cmpname' = 'begdate.cmpnama
-            say 'enddate.cmpname: enddate.'cmpname' = 'enddate.cmpnama
+            say 'begdate.'numexp' = 'begdate.numexp
+            say 'enddate.'numexp' = 'enddate.numexp
 
 *          'run setenv   "BEGDATEO" 'begdate.numexp
 *          'run setenv   "ENDDATEO" 'enddate.numexp
@@ -505,7 +505,7 @@ endif
 * Compute CLIMATOLOGY Flag for Comparison Experiment
 * --------------------------------------------------
                'run getenv "CLIMATE"'
-                        climate.cmpnama = result
+                        climate.numexp = result
                         anafile = obsfile.numexp.1
                         anadsc  =  obsdsc.numexp.1
                         ananam  =  obsnam.numexp.1
@@ -519,16 +519,16 @@ endif
                    k = k+1
 
                   'set dfile 'qfile.1
-             say  'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
-                  'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
+             say  'count "'season'" 'begdate' 'enddate
+                  'count "'season'" 'begdate' 'enddate
                    nmod = result
-             say  'climate.EXPID = 'climate.EXPIDa
+             say  'climexp = 'climexp
 
                   'set dfile 'anafile
-             say  'count "'season'" 'begdate.cmpnama' 'enddate.cmpnama
-                  'count "'season'" 'begdate.cmpnama' 'enddate.cmpnama
+             say  'count "'season'" 'begdate.numexp' 'enddate.numexp
+                  'count "'season'" 'begdate.numexp' 'enddate.numexp
                    nobs.numexp = result
-             say  'climate.cmpname = 'climate.cmpnama
+             say  'climate.'numexp' = 'climate.numexp
 
                   if( STAT = "STD" | STAT = "RMS" | STAT = "BIAS" )
                      'define obs'numexp''season' = sqrt( obs'numexp''season' )'
@@ -537,7 +537,7 @@ endif
 
                        flag = ""
                while ( flag = "" )
-              '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
+              'run genplt.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'alias.1' -SEASON 'season' -MBDATE 'begdate' -MEDATE 'enddate' -CLIMEXP 'climexp' -CBDATE 'begdate.numexp' -CEDATE 'enddate.numexp' -CLIMCMP 'climate.numexp' -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
                 if( DEBUG = "debug" )
                     say "Hit  ENTER  to repeat plot"
                     say "Type 'next' for  next plot, 'done' for next field"
@@ -573,10 +573,17 @@ endwhile
 * we can compute the Closeness plots to MERRA-2 and any CMPEXP ending with :V
 * ---------------------------------------------------------------------------
 
+* Assign ctag and cname for all experiments first
        k  = 1
 while( k <= numexp )
   cname.k =  oname.k.1
    ctag.k = obsnam.k.1
+k = k + 1
+endwhile
+
+* Now do the closeness loop
+       k  = 1
+while( k <= numexp )
 say ' '
 say 'Looping through experiments, k = 'k' CTAG = 'ctag.k' TYPE = 'type.k
 say '--------------------------------------------------------------'
@@ -618,17 +625,11 @@ else
          say '                        obs: 'ctag.TAG
          say '              Total  numexp: 'numexp
          say ''
-                                cmpnam = ctag.n
-                                obsnam = ctag.TAG
-                  'run fixname 'cmpnam
-                                cmpnamf = result
-                  'run fixname 'obsnam
-                                obsnamf = result
-
-     say '                          cmpnam: 'cmpnam
-     say '                          obsnam: 'obsnam
-     say '                  climate.cmpnam: 'climate.cmpnamf
-     say '                  climate.obsnam: 'climate.obsnamf
+
+         say '                          cmpnam: 'ctag.n
+         say '                          obsnam: 'ctag.TAG
+         say '                       climate.n = 'climate.n
+         say '                     climate.TAG = 'climate.TAG
 
                  flag = ""
          while ( flag = "" )
@@ -637,7 +638,7 @@ else
              'define zobs'n''season'   = regrid2( obs'n''season'  ,0.25,0.25,bs_p1,0,-90 )'
              'define zmod'season'      = regrid2( mod'season'     ,0.25,0.25,bs_p1,0,-90 )'
 
-             '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
+             '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' -MENDDATE 'enddate' -CFILE 'obsfile.n.1' -CBEGDATE 'begdate.n' -CENDDATE 'enddate.n' -OFILE 'obsfile.TAG.1' -OBEGDATE 'begdate.TAG' -OENDDATE 'enddate.TAG' -EXPID 'EXPID' -PREFIX 'NULL' -SEASON 'season' -OUTPUT 'OUTPUT' -CLIMEXP 'climexp' -CLIMCMP 'climate.n' -CLIMOBS 'climate.TAG' -GC 'GC.1' -MATH 'NULL' -LEVEL 'LEVEL
 
              'myprint -name 'OUTPUT'/hdiag_'ctag.n'_'NAME'.'GC.1'_'LEVEL'_closeness_'ctag.TAG'.'season
 

plots/grads_util/gencmpz.gs

@@ -245,9 +245,9 @@ endwhile
 'setdates'
 
 'run getenv "BEGDATE"'
-             begdate.EXPIDa = result
+             begdate = result
 'run getenv "ENDDATE"'
-             enddate.EXPIDa = result
+             enddate = result
 
 'setlons'
 'sety'
@@ -329,13 +329,13 @@ else
 endif
 
 'run getenv "CLIMATE"'
-             climate.EXPIDa = result
+             climate = result
 
 say ''
 say '        EXPID = 'EXPID
-say 'begdate.EXPID => begdate.'EXPID' = 'begdate.EXPIDa
-say 'enddate.EXPID => enddate.'EXPID' = 'enddate.EXPIDa
-say 'climate.EXPID => climate.'EXPID' = 'climate.EXPIDa
+say 'begdate = 'begdate
+say 'enddate = 'enddate
+say 'climexp = 'climexp
 say ''
 
 *******************************************************************
@@ -438,8 +438,8 @@ if( found = "TRUE" )
 
 'set dfile 'ofile.1
     'getdates'
-     begdate.CMPIDa = subwrd(result,1)
-     enddate.CMPIDa = subwrd(result,2)
+     begdate.num = subwrd(result,1)
+     enddate.num = subwrd(result,2)
 
 'set lon 'lonmin' 'lonmax
 'set lat 'latmin' 'latmax
@@ -518,15 +518,16 @@ endif
 say 'Processing Season: 'season
 
 'set dfile 'mfile.1
-'count "'season'" 'begdate.EXPIDa' 'enddate.EXPIDa
+'count "'season'" 'begdate' 'enddate
  nmod =  result
 
 'set dfile 'ofile.1
-'count "'season'" 'begdate.CMPIDa' 'enddate.CMPIDa
+'count "'season'" 'begdate.num' 'enddate.num
  nobs =  result
 
 'run getenv "CLIMATE"'
-             climate.CMPIDa = result
+             climate.num = result
+             climcmp.CMPIDa = climate.num
 
 * Set EXPORT Model and Observation Scaling Factors
 * ------------------------------------------------
@@ -605,7 +606,7 @@ while( n<=NPTOPS )
                        flag = ""
                while ( flag = "" )
 
-'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
+'run genpltz.gs -EXPID 'EXPID' -EXPORT 'EXPORT' -GC 'GC' -ALIAS 'mname.1' -QFILE 'mfile.1' -OFILE 'ofile.1' -ONAME 'CMPID' -OBDATE 'begdate.num' -OEDATE 'enddate.num' -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' -CLIMCMP 'climate.num' -MBDATE 'begdate' -MEDATE 'enddate
 
                 if( DEBUG = "debug" )
                     say "Hit  ENTER  to repeat plot"

plots/grads_util/makplotz.gs

@@ -37,7 +37,10 @@ endwhile
 
 if( math = NULL ) ; math = '' ; endif
 
+'setlons'
 'set t 1'
+'undefine qmodz'
+'undefine qobsz'
 'run getenv "GEOSUTIL"'
              geosutil = result
 
@@ -329,8 +332,21 @@ if( math = LOG )
 else
     mathparm = ''
 endif
+
+'set gxout stat'
+'d qmodz'
+qmodz_line  = sublin(result,6)
+qmodz_valid = subwrd(qmodz_line,4)
+'d qobsz'
+qobsz_line  = sublin(result,6)
+qobsz_valid = subwrd(qobsz_line,4)
+'set gxout line'
+
+if( qmodz_valid > 0 & qobsz_valid > 0 )
 'myprint -name 'output'/'mname'_z_'mathparm''PFX''oname'.'season
+endif
 
+'setlons'
 'set mproj latlon'
 return
 

plots/portrait.script

@@ -315,7 +315,7 @@ endif
    if( $plot == $plotname.$n ) $grads $batch -p -c "run genplot -EXPORT   LHFX:SURFACE  -NAME eflux   -EXPID $expid -OUTPUT $output -DEBUG $debug -SCALE 1 -PREFIX LAND  -LAND  -SEASON $seasons " ; set plots = `echo $plots $plotname.$n` ; @ n = $n + 1
    if( $plot == $plotname.$n ) $grads $batch -p -c "run genplot -EXPORT   LHFX:SURFACE  -NAME eflux   -EXPID $expid -OUTPUT $output -DEBUG $debug -SCALE 1               -OCEAN -SEASON $seasons " ; set plots = `echo $plots $plotname.$n` ; @ n = $n + 1
 
-   if( $plot == $plotname.$n ) $grads $batch -p -c "run genplot -EXPORT LWP:MOIST CCWP:MOIST -OBS LWP:MOIST -NAME lwp  -EXPID $expid -OUTPUT $output -DEBUG $debug -SCALE 1000 -OCEAN -SEASON $seasons " ; set plots = `echo $plots $plotname.$n` ; @ n = $n + 1
+   if( $plot == $plotname.$n ) $grads $batch -p -c "run genplot -EXPORT LWP:MOIST -OBS LWP:MOIST -NAME lwp  -EXPID $expid -OUTPUT $output -DEBUG $debug -SCALE 1000 -OCEAN -SEASON $seasons " ; set plots = `echo $plots $plotname.$n` ; @ n = $n + 1
 
    if( $plot == $plotname.$n ) $grads $batch -p -c "run genplot -EXPORT TQV:AGCM   -NAME tpw  -EXPID $expid -OUTPUT $output -DEBUG $debug -SCALE 0.1 -SEASON $seasons " ; set plots = `echo $plots $plotname.$n` ; @ n = $n + 1