Skip to content

Commit b74983d

Browse files
authored
Merge pull request #110 from GEOS-ESM/feature/ltakacs/TEM_Diag_Updates_for_ALL_Times_20241108
Updates for TEM_Diag to include ALL Times
2 parents 07eaa59 + 591e319 commit b74983d

File tree

10 files changed

+355
-170
lines changed

10 files changed

+355
-170
lines changed

CHANGELOG.md

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1717

1818
### Deprecated
1919

20-
## [2.1.4] - 2024-12-05
20+
## [2.1.5] - 2024-12-05
2121

22-
### Added
22+
### Changed
2323

24-
- Added remapping for GEOS-IT restarts
25-
- Added new res C1120
26-
- NOTE: If running on SLES15 remap tests will not be zero diff for GOCART RST but are zero diff for all other
24+
- Updates for TEM_Diag to include ALL Times
25+
26+
## [2.1.4] - 2024-12-05
2727

2828
### Changed
2929

30-
- Update ESMF CMake target to `ESMF::ESMF`
30+
- Update GitHub Actions
3131

3232
### Fixed
3333

3434
- Correct bug in `remap_restarts.py` where `N2O` was added as `N20`
3535

3636
## [2.1.3] - 2024-10-08
3737

38+
### Added
39+
40+
- Added remapping for GEOS-IT restarts
41+
- Added new res C1120
42+
- NOTE: If running on SLES15 remap tests will not be zero diff for GOCART RST but are zero diff for all other
43+
44+
### Changed
45+
46+
- Update ESMF CMake target to `ESMF::ESMF`
47+
3848
### Fixed
3949

4050
- Plots package bug fixes for EXPID names containing periods and TEM diagnostics

plots/grads_util/pause.gs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,19 @@ function pause (args)
22
'numargs 'args
33
numargs = result
44
if( numargs > 0 )
5-
string = subwrd(args,1)
6-
num = 2
7-
while ( num <= numargs )
8-
string = string' 'subwrd(args,num)
9-
num = num + 1
10-
endwhile
11-
say string
5+
string = subwrd(args,1)
6+
num = 2
7+
while ( num <= numargs )
8+
string = string' 'subwrd(args,num)
9+
num = num + 1
10+
endwhile
11+
say string
1212
endif
1313
say 'Paused, Hit ENTER to Continue (or c to Clear and Continue) ...'
14-
pull flag
15-
if( flag = 'c' )
16-
'c'
17-
endif
18-
return
14+
pull flag
15+
'run uppercase 'flag
16+
flag = result
17+
if( flag = 'C' )
18+
'c'
19+
endif
20+
return

plots/portrait.script

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,8 @@ if( $plot == residual ) then
289289

290290
setenv ORIENTATION LANDSCAPE
291291
$grads $batch -l -c "run $GEOSUTIL/plots/res/res $expid $output $debug $seasons "
292-
$grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output $seasons "
292+
$grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output B $seasons "
293+
$grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output A $seasons "
293294
$grads $batch -l -c "run $GEOSUTIL/plots/res/setup_epflx $source $expid $output $debug $seasons "
294295
$grads $batch -l -c "run $GEOSUTIL/plots/zcmp/zcmp $expid $output $seasons "
295296
endif

plots/quickplot

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,7 @@ else
376376
setenv CMPEXP "$cmpops $cmpexp"
377377
endif
378378
endif
379+
setenv DEBUG "$debug"
379380

380381
# ECHO Setup
381382
# ----------

plots/res/epflx_diff.gs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ say 'Defined Variables:'
124124
say '------------------'
125125
'q define'
126126
say result
127-
pause
127+
*pause
128128
'makezdif -q1 epfdiv'num''season''time' -file1 'num' -q2 epfdiv'num2''season''time' -file2 'num2' -name epdiff -ptop 1' ; 'run getenv ZDIFILE' ; epfile = result
129129

130130
say 'makezdif -q1 epfy'num''season''time' -file1 'num' -q2 epfy'num2''season''time' -file2 'num2' -name epydiff -ptop 1' ; 'run getenv ZDIFILE' ; epyfile = result
131-
pause
131+
*pause
132132
'makezdif -q1 epfy'num''season''time' -file1 'num' -q2 epfy'num2''season''time' -file2 'num2' -name epydiff -ptop 1' ; 'run getenv ZDIFILE' ; epyfile = result
133133

134134
say 'makezdif -q1 epfz'num''season''time' -file1 'num' -q2 epfz'num2''season''time' -file2 'num2' -name epzdiff -ptop 1' ; 'run getenv ZDIFILE' ; epzfile = result
135-
pause
135+
*pause
136136
'makezdif -q1 epfz'num''season''time' -file1 'num' -q2 epfz'num2''season''time' -file2 'num2' -name epzdiff -ptop 1' ; 'run getenv ZDIFILE' ; epzfile = result
137137

138138
'set dfile 'epfile

0 commit comments

Comments
 (0)