Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion plots/chckhist.new
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plots/grads_util/gencmp.gs
Original file line number Diff line number Diff line change
Expand Up @@ -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
* --------------------
Expand Down
7 changes: 5 additions & 2 deletions plots/grads_util/gencmpz.gs
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ endwhile
* ------------------------------------------------------------
m = 0
k = 1

while ( k <= n )

dummy = EXPORT.k
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -237,6 +239,7 @@ endwhile
'run getenv "VERIFICATION"'
verification = result


'run getenv "ANALYSIS"'
analysis = result

Expand All @@ -261,6 +264,7 @@ if( numlevs = 1 )
'set z 1'
else
'setz'

endif

* Get Dimension of Model Environment
Expand Down Expand Up @@ -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
* --------------------
Expand Down Expand Up @@ -696,4 +700,3 @@ function checkbit (word)
dum = bit'TEST'
if( dum = "ETEST" ) ; bit = A ; endif
return bit

2 changes: 1 addition & 1 deletion plots/grads_util/genplot.gs
Original file line number Diff line number Diff line change
Expand Up @@ -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
* ----------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/grads_util/genplot_2G.gs
Original file line number Diff line number Diff line change
Expand Up @@ -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
* ----------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/hcmp/hcmp2
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plots/olr/olr
Original file line number Diff line number Diff line change
Expand Up @@ -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
* -----------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/olr/olrcc5
Original file line number Diff line number Diff line change
Expand Up @@ -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
* -----------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/quad/hquad
Original file line number Diff line number Diff line change
Expand Up @@ -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
* -------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/quad/zquad
Original file line number Diff line number Diff line change
Expand Up @@ -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
* -------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/res/zonal.gs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plots/tseries/aerosols
Original file line number Diff line number Diff line change
Expand Up @@ -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
* -----------------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/tseries/pme
Original file line number Diff line number Diff line change
Expand Up @@ -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
* ---------------------------
Expand Down
2 changes: 1 addition & 1 deletion plots/tseries/rad
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plots/tseries/tpw
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plots/zcmp/progz
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plots/zcmp1/progz1
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion plots/zcmp1/qbo
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion plots/zcmp1/vortex
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading