cpld_gridgen: Allow 4-character specifiers in filenames for post weig…

…hts (#883) Change 3-character descriptions of destination grids for post weight generation to be 4-character by adding a trailing '0' when needed. Fixes #882.
ufs-community · Dec 18, 2023 · 8639547 · 8639547
1 parent a757eb0
commit 8639547
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 165 deletions.
diff --git a/reg_tests/cpld_gridgen/RegressionTests_hera.intel.log b/reg_tests/cpld_gridgen/RegressionTests_hera.intel.log
@@ -1,8 +1,8 @@
-Thu Oct 26 17:23:32 UTC 2023
+Fri Dec 15 20:03:43 UTC 2023
 Start Regression test
 
-Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_198243/025
-Baseline dir = /scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/025.new
+Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_148527/025
+Baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/BASELINE/025
 
 Checking test 025 results ....
 Comparing Bu.mx025_SCRIP.nc........OK
@@ -21,25 +21,25 @@ Comparing grid_cice_NEMS_mx025.nc........OK
 Comparing kmtu_cice_NEMS_mx025.nc........OK
 Comparing mesh.mx025.nc........OK
 Comparing rect.0p25_SCRIP.nc........OK
-Comparing rect.0p5_SCRIP.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.0p50_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Bu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.Ct.to.rect.0p25.bilinear.nc........OK
 Comparing tripole.mx025.Ct.to.rect.0p25.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.0p5.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.0p5.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.0p50.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.0p50.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx025.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.nc........OK
 
 
-Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_198243/050
-Baseline dir = /scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/050.new
+Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_148527/050
+Baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/BASELINE/050
 
 Checking test 050 results ....
 Comparing Bu.mx050_SCRIP.nc........OK
@@ -58,24 +58,24 @@ Comparing Cv.mx050_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx050.nc........OK
 Comparing kmtu_cice_NEMS_mx050.nc........OK
 Comparing mesh.mx050.nc........OK
-Comparing rect.0p5_SCRIP.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.0p50_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx050.Ct.neareststod.nc........OK
 Comparing tripole.mx050.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.0p5.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.0p5.conserve.nc........OK
-Comparing tripole.mx050.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx050.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.0p50.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.0p50.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx050.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx050.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx050.nc........OK
 
 
-Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_198243/100
-Baseline dir = /scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/100.new
+Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_148527/100
+Baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/BASELINE/100
 
 Checking test 100 results ....
 Comparing Bu.mx100_SCRIP.nc........OK
@@ -94,22 +94,22 @@ Comparing Cv.mx100_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx100.nc........OK
 Comparing kmtu_cice_NEMS_mx100.nc........OK
 Comparing mesh.mx100.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx100.Ct.neareststod.nc........OK
 Comparing tripole.mx100.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx100.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx100.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx100.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx100.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx100.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx100.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx100.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx100.nc........OK
 Comparing ufs.topo_edits_011818.nc........OK
 
 
-Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_198243/500
-Baseline dir = /scratch1/NCEPDEV/nems/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/500.new
+Working dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/rt_148527/500
+Baseline dir = /scratch1/NCEPDEV/stmp4/Denise.Worthen/CPLD_GRIDGEN/BASELINE/500
 
 Checking test 500 results ....
 Comparing Bu.mx500_SCRIP.nc........OK
@@ -128,16 +128,16 @@ Comparing Cv.mx500_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx500.nc........OK
 Comparing kmtu_cice_NEMS_mx500.nc........OK
 Comparing mesh.mx500.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx500.Ct.neareststod.nc........OK
 Comparing tripole.mx500.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx500.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx500.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx500.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx500.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx500.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx500.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx500.nc........OK
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Thu Oct 26 17:46:20 UTC 2023
-Elapsed time: 00h:24m:25s. Have a nice day!
+Fri Dec 15 20:29:09 UTC 2023
+Elapsed time: 00h:25m:28s. Have a nice day!
diff --git a/reg_tests/cpld_gridgen/RegressionTests_jet.intel.log b/reg_tests/cpld_gridgen/RegressionTests_jet.intel.log
@@ -1,8 +1,8 @@
-Thu Oct 26 18:20:27 UTC 2023
+Sat Dec 16 18:41:27 UTC 2023
 Start Regression test
 
-Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_55026/025
-Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/025.new
+Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_97163/025
+Baseline dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/BASELINE/025
 
 Checking test 025 results ....
 Comparing Bu.mx025_SCRIP.nc........OK
@@ -21,25 +21,25 @@ Comparing grid_cice_NEMS_mx025.nc........OK
 Comparing kmtu_cice_NEMS_mx025.nc........OK
 Comparing mesh.mx025.nc........OK
 Comparing rect.0p25_SCRIP.nc........OK
-Comparing rect.0p5_SCRIP.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.0p50_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Bu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.Ct.to.rect.0p25.bilinear.nc........OK
 Comparing tripole.mx025.Ct.to.rect.0p25.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.0p5.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.0p5.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx025.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx025.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.0p50.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.0p50.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx025.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx025.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx025.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx025.nc........OK
 
 
-Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_55026/050
-Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/050.new
+Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_97163/050
+Baseline dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/BASELINE/050
 
 Checking test 050 results ....
 Comparing Bu.mx050_SCRIP.nc........OK
@@ -58,24 +58,24 @@ Comparing Cv.mx050_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx050.nc........OK
 Comparing kmtu_cice_NEMS_mx050.nc........OK
 Comparing mesh.mx050.nc........OK
-Comparing rect.0p5_SCRIP.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.0p50_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx050.Ct.neareststod.nc........OK
 Comparing tripole.mx050.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.0p5.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.0p5.conserve.nc........OK
-Comparing tripole.mx050.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx050.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx050.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.0p50.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.0p50.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx050.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx050.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx050.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx050.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx050.nc........OK
 
 
-Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_55026/100
-Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/100.new
+Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_97163/100
+Baseline dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/BASELINE/100
 
 Checking test 100 results ....
 Comparing Bu.mx100_SCRIP.nc........OK
@@ -94,22 +94,22 @@ Comparing Cv.mx100_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx100.nc........OK
 Comparing kmtu_cice_NEMS_mx100.nc........OK
 Comparing mesh.mx100.nc........OK
-Comparing rect.1p0_SCRIP.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.1p00_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx100.Ct.neareststod.nc........OK
 Comparing tripole.mx100.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.1p0.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.1p0.conserve.nc........OK
-Comparing tripole.mx100.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx100.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx100.Ct.to.rect.1p00.bilinear.nc........OK
+Comparing tripole.mx100.Ct.to.rect.1p00.conserve.nc........OK
+Comparing tripole.mx100.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx100.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx100.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx100.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx100.nc........OK
 Comparing ufs.topo_edits_011818.nc........OK
 
 
-Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_55026/500
-Baseline dir = /lfs4/HFIP/hfv3gfs/emc.nemspara/role.ufsutils/ufs_utils/reg_tests/cpld_gridgen/baseline_data/500.new
+Working dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/rt_97163/500
+Baseline dir = /lfs4/HFIP/h-nems/Denise.Worthen/CPLD_GRIDGEN/BASELINE/500
 
 Checking test 500 results ....
 Comparing Bu.mx500_SCRIP.nc........OK
@@ -128,16 +128,16 @@ Comparing Cv.mx500_SCRIP.nc........OK
 Comparing grid_cice_NEMS_mx500.nc........OK
 Comparing kmtu_cice_NEMS_mx500.nc........OK
 Comparing mesh.mx500.nc........OK
-Comparing rect.5p0_SCRIP.nc........OK
+Comparing rect.5p00_SCRIP.nc........OK
 Comparing tripole.mx025.Ct.to.mx500.Ct.neareststod.nc........OK
 Comparing tripole.mx500.Bu.to.Ct.bilinear.nc........OK
-Comparing tripole.mx500.Ct.to.rect.5p0.bilinear.nc........OK
-Comparing tripole.mx500.Ct.to.rect.5p0.conserve.nc........OK
+Comparing tripole.mx500.Ct.to.rect.5p00.bilinear.nc........OK
+Comparing tripole.mx500.Ct.to.rect.5p00.conserve.nc........OK
 Comparing tripole.mx500.Cu.to.Ct.bilinear.nc........OK
 Comparing tripole.mx500.Cv.to.Ct.bilinear.nc........OK
 Comparing tripole.mx500.nc........OK
 
 
 REGRESSION TEST WAS SUCCESSFUL
-Thu Oct 26 18:50:56 UTC 2023
-Elapsed time: 00h:32m:10s. Have a nice day!
+Sat Dec 16 19:13:08 UTC 2023
+Elapsed time: 00h:31m:44s. Have a nice day!