Actually switch to CRTM 2.4 now (#550)

* start to 2.4 fix * Change to use CRTM fix env var
NOAA-EMC · Aug 4, 2023 · 62ac75c · 62ac75c
1 parent 12c3d4f
commit 62ac75c
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/modulefiles/GDAS/hera.lua b/modulefiles/GDAS/hera.lua
@@ -80,7 +80,7 @@ setenv('MPIEXEC_EXEC', mpiexec)
 setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv('R2D2_CONFIG', '/scratch1/NCEPDEV/stmp4/Cory.R.Martin/R2D2_SHARED/config_hera.yaml')
-setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm")
+setenv("CRTM_FIX","/scratch1/NCEPDEV/da/Cory.R.Martin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data")
 prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin")
 

diff --git a/modulefiles/GDAS/orion.lua b/modulefiles/GDAS/orion.lua
@@ -78,7 +78,7 @@ setenv('MPIEXEC_EXEC', mpiexec)
 setenv('MPIEXEC_NPROC', mpinproc)
 
 setenv('R2D2_CONFIG', '/work2/noaa/da/cmartin/GDASApp/R2D2_SHARED/config_orion.yaml')
-setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm")
+setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0")
 setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data")
 prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin")
 

diff --git a/test/atm/global-workflow/config.atmanl b/test/atm/global-workflow/config.atmanl
@@ -20,6 +20,6 @@ export io_layout_x=1
 export io_layout_y=1
 
 export JEDIEXE=${HOMEgfs}/exec/fv3jedi_var.x
-export crtm_VERSION="2.3.0"
+export crtm_VERSION="2.4.0"
 
 echo "END: config.atmanl"
diff --git a/ush/ufoeval/run_ufo_hofx_test.sh b/ush/ufoeval/run_ufo_hofx_test.sh
@@ -135,7 +135,7 @@ mkdir -p $workdir
 
 # Link CRTM coefficients
 [ -d $workdir/crtm ] && rm -rf $workdir/crtm
-ln -sf $FixDir/crtm/2.3.0 $workdir/crtm
+ln -sf $FixDir/crtm/2.4.0 $workdir/crtm
 
 # copy BC files
 if [ $radiance = "YES" ]; then

diff --git a/ush/ufsda/stage.py b/ush/ufsda/stage.py
@@ -67,7 +67,7 @@ def gdas_fix(input_fix_dir, working_dir, config):
     ufsda.disk_utils.symlink(os.path.join(gdasapp_parm, 'io', 'fv3jedi_fieldmetadata_restart.yaml'),
                              os.path.join(config['fv3jedi_fieldmetadata_dir'], 'fv3jedi_fieldmetadata_restart.yaml'))
     # link CRTM coeff dir
-    ufsda.disk_utils.symlink(os.path.join(input_fix_dir, 'crtm', '2.3.0'),
+    ufsda.disk_utils.symlink(os.path.join(input_fix_dir, 'crtm', '2.4.0'),
                              config['CRTM_COEFF_DIR'])