hand-merge main into feature/sdrabenh/gcm_v12

Author: sdrabenh

.github/workflows/validate_yaml_files.yml

@@ -15,7 +15,7 @@ jobs:
   validate-YAML:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3.2.0
+      - uses: actions/checkout@v4
       - id: yaml-lint
         name: yaml-lint
         uses: ibiqlik/action-yamllint@v3
@@ -24,7 +24,7 @@ jobs:
           format: colored
           config_file: .yamllint.yml
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         if: always()
         with:
           name: yamllint-logfile

CHANGELOG.md

@@ -18,8 +18,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Update ESMF CMake target to `ESMF::ESMF`
-
 ### Fixed
 
 - Fixed issue with SLES15 in remapping
@@ -28,8 +26,34 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Deprecated
 
+## [2.1.5] - 2024-12-05
+
+### Changed
+
+- Updates for TEM_Diag to include ALL Times
+
+## [2.1.4] - 2024-12-05
+
+### Changed
+
+- Update GitHub Actions
+
+### Fixed
+
+- Correct bug in `remap_restarts.py` where `N2O` was added as `N20`
+
 ## [2.1.3] - 2024-10-08
 
+### Added
+
+- Added remapping for GEOS-IT restarts
+- Added new res C1120
+- NOTE: If running on SLES15 remap tests will not be zero diff for GOCART RST but are zero diff for all other
+
+### Changed
+
+- Update ESMF CMake target to `ESMF::ESMF`
+
 ### Fixed
 
 - Plots package bug fixes for EXPID names containing periods and TEM diagnostics

plots/grads_util/pause.gs

@@ -2,17 +2,19 @@ function pause (args)
 'numargs  'args
  numargs = result
 if( numargs > 0 )
- string  = subwrd(args,1)
-        num  = 2
-while ( num <= numargs )
-        string = string' 'subwrd(args,num)
-        num = num + 1
-endwhile
-say string
+    string  = subwrd(args,1)
+            num  = 2
+    while ( num <= numargs )
+            string = string' 'subwrd(args,num)
+            num = num + 1
+    endwhile
+    say string
 endif
 say 'Paused, Hit ENTER to Continue (or c to Clear and Continue) ...'
-pull flag
-if( flag = 'c' )
-'c'
-endif
-return
+     pull flag
+    'run uppercase 'flag
+                    flag = result
+    if( flag = 'C' )
+        'c'
+    endif
+    return

plots/portrait.script

@@ -289,7 +289,8 @@ if( $plot == residual ) then
 
      setenv ORIENTATION LANDSCAPE
      $grads $batch -l -c "run $GEOSUTIL/plots/res/res  $expid $output $debug $seasons "
-     $grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output $seasons "
+     $grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output B $seasons "
+     $grads $batch -l -c "run $GEOSUTIL/plots/res/setup_wstar $source $expid $output A $seasons "
      $grads $batch -l -c "run $GEOSUTIL/plots/res/setup_epflx $source $expid $output $debug $seasons "
      $grads $batch -l -c "run $GEOSUTIL/plots/zcmp/zcmp $expid $output $seasons "
 endif

plots/quickplot

@@ -376,6 +376,7 @@ else
          setenv CMPEXP "$cmpops $cmpexp"
     endif
 endif
+         setenv DEBUG  "$debug"
 
 # ECHO Setup
 # ----------

plots/res/epflx_diff.gs

@@ -124,15 +124,15 @@ say 'Defined Variables:'
 say '------------------'
 'q define'
 say result
-pause
+*pause
     'makezdif -q1 epfdiv'num''season''time' -file1 'num' -q2 epfdiv'num2''season''time' -file2 'num2' -name epdiff  -ptop 1' ; 'run getenv ZDIFILE' ;  epfile = result
 
 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
-pause
+*pause
     'makezdif -q1   epfy'num''season''time' -file1 'num' -q2   epfy'num2''season''time' -file2 'num2' -name epydiff -ptop 1' ; 'run getenv ZDIFILE' ; epyfile = result
 
 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
-pause
+*pause
     'makezdif -q1   epfz'num''season''time' -file1 'num' -q2   epfz'num2''season''time' -file2 'num2' -name epzdiff -ptop 1' ; 'run getenv ZDIFILE' ; epzfile = result
 
 'set dfile 'epfile