diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c796888..53faa994 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Remove forced `-f` flag from `nccmp` comparison in `test_remap_restarts.py` - Removed duplicates from portrait.script that were created as a result of merging previous pull requests - Updated moveplot to not crash with filenames included double colons +- Updated plotting scripts to ignore comments in HISTORY.rc ### Removed diff --git a/plots/chckhist.new b/plots/chckhist.new index 7074787b..cbfe23d0 100755 --- a/plots/chckhist.new +++ b/plots/chckhist.new @@ -53,7 +53,7 @@ set EXPORT = `echo $TEMP_EXPORT | cut -d: -f1 | sed 's/DBLCOLON/::/g'` # Create true comma-separated HISTORY variable # -------------------------------------------- if(! -e HISTORY.T ) then - cat $HISTORYRC | sed -e 's/,/ , /g' | sed -e 's/*/@/g' | sed -e 's/?/ /g' > HISTORY.T + cat $HISTORYRC | sed -e 's/#.*//g' | sed -e 's/,/ , /g' | sed -e 's/*/@/g' | sed -e 's/?/ /g' > HISTORY.T endif ./strip HISTORY.T diff --git a/plots/grads_util/gencmp.gs b/plots/grads_util/gencmp.gs index ca4084c6..19612931 100644 --- a/plots/grads_util/gencmp.gs +++ b/plots/grads_util/gencmp.gs @@ -372,7 +372,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get CMPEXP Variables * -------------------- diff --git a/plots/grads_util/gencmpz.gs b/plots/grads_util/gencmpz.gs index cdf42673..c1e58052 100644 --- a/plots/grads_util/gencmpz.gs +++ b/plots/grads_util/gencmpz.gs @@ -96,6 +96,7 @@ endwhile * ------------------------------------------------------------ m = 0 k = 1 + while ( k <= n ) dummy = EXPORT.k @@ -148,6 +149,7 @@ if( n = m ) else say 'Number of EXPORTS does not equal number of GCs!' say 'Number of EXPORTS: 'n + say ' GCS: 'm return endif @@ -237,6 +239,7 @@ endwhile 'run getenv "VERIFICATION"' verification = result + 'run getenv "ANALYSIS"' analysis = result @@ -261,6 +264,7 @@ if( numlevs = 1 ) 'set z 1' else 'setz' + endif * Get Dimension of Model Environment @@ -386,7 +390,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get CMPEXP Variables * -------------------- @@ -696,4 +700,3 @@ function checkbit (word) dum = bit'TEST' if( dum = "ETEST" ) ; bit = A ; endif return bit - diff --git a/plots/grads_util/genplot.gs b/plots/grads_util/genplot.gs index b6f22397..f47fd22b 100644 --- a/plots/grads_util/genplot.gs +++ b/plots/grads_util/genplot.gs @@ -506,7 +506,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get EXP Comparison Variables * ---------------------------- diff --git a/plots/grads_util/genplot_2G.gs b/plots/grads_util/genplot_2G.gs index 3285e34d..76a1b7c1 100644 --- a/plots/grads_util/genplot_2G.gs +++ b/plots/grads_util/genplot_2G.gs @@ -660,7 +660,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get EXP Comparison Variables * ---------------------------- diff --git a/plots/hcmp/hcmp2 b/plots/hcmp/hcmp2 index 25144f51..092dcb22 100644 --- a/plots/hcmp/hcmp2 +++ b/plots/hcmp/hcmp2 @@ -391,7 +391,7 @@ if( EXPORT = "CHI" | EXPORT = "PSI" ) ; 'run setenv "DIFFTYPE" 'D ; endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' if ( EXPORT = "HE" ) 'run getvar ZLE DYN 'exp diff --git a/plots/olr/olr b/plots/olr/olr index ab4ec7f1..26578626 100644 --- a/plots/olr/olr +++ b/plots/olr/olr @@ -169,7 +169,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get Radiation Variables * ----------------------- diff --git a/plots/olr/olrcc5 b/plots/olr/olrcc5 index 98846005..032984bc 100644 --- a/plots/olr/olrcc5 +++ b/plots/olr/olrcc5 @@ -169,7 +169,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get Radiation Variables * ----------------------- diff --git a/plots/quad/hquad b/plots/quad/hquad index e3d3768c..236efc1a 100644 --- a/plots/quad/hquad +++ b/plots/quad/hquad @@ -234,7 +234,7 @@ say 'Comparing with: 'exp '!/bin/cp 'exp'/HISTORY.rc .' endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get CMPEXP Primary Fields * ------------------------- diff --git a/plots/quad/zquad b/plots/quad/zquad index a547c3f8..8d8bb847 100644 --- a/plots/quad/zquad +++ b/plots/quad/zquad @@ -308,7 +308,7 @@ say 'Comparing with: 'exp '!/bin/cp 'exp'/HISTORY.rc .' endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get CMPEXP Primary Fields * ------------------------- diff --git a/plots/res/zonal.gs b/plots/res/zonal.gs index 73222119..8833a6ab 100644 --- a/plots/res/zonal.gs +++ b/plots/res/zonal.gs @@ -464,7 +464,7 @@ say '----------------------------------------------------------- ' say ' ' *pause -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' 'run getvar V DYN 'exp say 'GETVAR output: 'result diff --git a/plots/tseries/aerosols b/plots/tseries/aerosols index 420610ff..47e90d72 100644 --- a/plots/tseries/aerosols +++ b/plots/tseries/aerosols @@ -95,7 +95,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get Comparison Experiment Variables * ----------------------------------- diff --git a/plots/tseries/pme b/plots/tseries/pme index e1222813..c9b779a5 100644 --- a/plots/tseries/pme +++ b/plots/tseries/pme @@ -172,7 +172,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' * Get Precipitation Variables * --------------------------- diff --git a/plots/tseries/rad b/plots/tseries/rad index d82083d1..dc9e0772 100644 --- a/plots/tseries/rad +++ b/plots/tseries/rad @@ -179,7 +179,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' 'run getvar OLR IRRAD 'exp oname.1 = subwrd(result,1) diff --git a/plots/tseries/tpw b/plots/tseries/tpw index 0e3a2272..02582850 100644 --- a/plots/tseries/tpw +++ b/plots/tseries/tpw @@ -71,7 +71,7 @@ say 'Comparing with: 'exp endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' 'run getvar TQV AGCM 'exp oname = subwrd(result,1) diff --git a/plots/zcmp/progz b/plots/zcmp/progz index fb4359b7..8bde7d24 100644 --- a/plots/zcmp/progz +++ b/plots/zcmp/progz @@ -201,7 +201,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' if ( EXPORT = "HE" ) 'run getvar ZLE DYN 'exp diff --git a/plots/zcmp1/progz1 b/plots/zcmp1/progz1 index 0635813b..bc8bc2df 100644 --- a/plots/zcmp1/progz1 +++ b/plots/zcmp1/progz1 @@ -138,7 +138,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' if ( EXPORT = "HE" ) 'run getvar ZLE DYN 'exp diff --git a/plots/zcmp1/qbo b/plots/zcmp1/qbo index 1a6998cd..5d2f8830 100755 --- a/plots/zcmp1/qbo +++ b/plots/zcmp1/qbo @@ -143,7 +143,7 @@ faco = 1 endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' 'run getvar 'EXPORT' 'GC' 'exp oname = subwrd(result,1) diff --git a/plots/zcmp1/vortex b/plots/zcmp1/vortex index 5cf1696c..21941546 100755 --- a/plots/zcmp1/vortex +++ b/plots/zcmp1/vortex @@ -202,7 +202,7 @@ endif endif '!remove CHECKFILE.txt' -'!cat HISTORY.rc | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' +'!cat HISTORY.rc | sed -e "s/#.*//g" | sed -e "s/,/ , /g" | sed -e "s/*/@/g" > HISTORY.T' 'run getvar 'EXPORT' 'GC' 'exp oname = subwrd(result,1)