From 62ac75c9a2c72d91a64461fd8fb8210fbeab3a5b Mon Sep 17 00:00:00 2001 From: Cory Martin Date: Fri, 4 Aug 2023 16:05:05 -0400 Subject: [PATCH] Actually switch to CRTM 2.4 now (#550) * start to 2.4 fix * Change to use CRTM fix env var --- modulefiles/GDAS/hera.lua | 2 +- modulefiles/GDAS/orion.lua | 2 +- test/atm/global-workflow/config.atmanl | 2 +- ush/ufoeval/run_ufo_hofx_test.sh | 2 +- ush/ufsda/stage.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modulefiles/GDAS/hera.lua b/modulefiles/GDAS/hera.lua index 76012b0da..f4946fdb0 100644 --- 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 index 0eb0875b1..e9463219c 100644 --- 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 index c7c106ccc..147a042ae 100755 --- 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 index 8ec802038..f78745e01 100755 --- 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 index bed7a9b39..6698324fc 100644 --- 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'])