From 00089d4f52efd688bee4bde35155baf3e1b46abb Mon Sep 17 00:00:00 2001 From: RussTreadon-NOAA <26926959+RussTreadon-NOAA@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:01:08 -0400 Subject: [PATCH] replace model_data with model (#1202) NCO requires `model_data` be replaced with `model` in the path to model data. This PR satisfies NCO's requirement. Resolves #1198 --- modulefiles/GDAS/hera.intel.lua | 6 ++--- modulefiles/GDAS/hercules.intel.lua | 6 ++--- modulefiles/GDAS/orion.intel.lua | 6 ++--- modulefiles/GDAS/wcoss2.intel.lua | 4 ++-- scripts/exgdas_global_marine_analysis_prep.py | 2 +- test/aero/global-workflow/jjob_var_init.sh | 2 +- test/atm/global-workflow/jjob_ens_init.sh | 4 ++-- test/atm/global-workflow/jjob_var_init.sh | 8 +++---- test/snow/apply_jedi_incr.sh | 2 +- test/snow/create_bkg_ens.sh | 2 +- test/snow/letkfoi_snowda.sh | 2 +- test/snow/test_imsproc.sh | 2 +- test/soca/gw/prep.sh | 22 +++++++++---------- ush/soca/marine_recenter.py | 2 +- ush/soca/run_jjobs.py | 8 +++---- 15 files changed, 39 insertions(+), 39 deletions(-) diff --git a/modulefiles/GDAS/hera.intel.lua b/modulefiles/GDAS/hera.intel.lua index 4889000d8..230498252 100644 --- a/modulefiles/GDAS/hera.intel.lua +++ b/modulefiles/GDAS/hera.intel.lua @@ -83,9 +83,9 @@ local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) -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") -setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/Cory.R.Martin/CI/GDASApp/data/test") +setenv("CRTM_FIX","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/fix/crtm/2.4.0") +setenv("GDASAPP_TESTDATA","/scratch1/NCEPDEV/da/role.jedipara/GDASApp/testdata") +setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/scratch1/NCEPDEV/da/role.jedipara/GDASApp/unittestdata") --prepend_path("PATH","/scratch2/NCEPDEV/nwprod/hpc-stack/libs/hpc-stack/intel-18.0.5.274/prod_util/1.2.2/bin") whatis("Name: ".. pkgName) diff --git a/modulefiles/GDAS/hercules.intel.lua b/modulefiles/GDAS/hercules.intel.lua index 0042d6075..b5d5f6cce 100644 --- a/modulefiles/GDAS/hercules.intel.lua +++ b/modulefiles/GDAS/hercules.intel.lua @@ -79,9 +79,9 @@ local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) -setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0") -setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data") -setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/") +setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0") +setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata") +setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata") prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin") execute{cmd="ulimit -s unlimited",modeA={"load"}} diff --git a/modulefiles/GDAS/orion.intel.lua b/modulefiles/GDAS/orion.intel.lua index 90516a711..0177e9302 100644 --- a/modulefiles/GDAS/orion.intel.lua +++ b/modulefiles/GDAS/orion.intel.lua @@ -79,9 +79,9 @@ local mpinproc = '-n' setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) -setenv("CRTM_FIX","/work2/noaa/da/cmartin/GDASApp/fix/crtm/2.4.0") -setenv("GDASAPP_TESTDATA","/work2/noaa/da/cmartin/CI/GDASApp/data") -setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/cmartin/CI/GDASApp/data/test/") +setenv("CRTM_FIX","/work2/noaa/da/role-da/GDASApp/fix/crtm/2.4.0") +setenv("GDASAPP_TESTDATA","/work2/noaa/da/role-da/GDASApp/testdata") +setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/work2/noaa/da/role-da/GDASApp/unittestdata") prepend_path("PATH","/apps/contrib/NCEP/libs/hpc-stack/intel-2018.4/prod_util/1.2.2/bin") execute{cmd="ulimit -s unlimited",modeA={"load"}} diff --git a/modulefiles/GDAS/wcoss2.intel.lua b/modulefiles/GDAS/wcoss2.intel.lua index 4607f0a09..00181a6de 100644 --- a/modulefiles/GDAS/wcoss2.intel.lua +++ b/modulefiles/GDAS/wcoss2.intel.lua @@ -46,8 +46,8 @@ setenv('MPIEXEC_EXEC', mpiexec) setenv('MPIEXEC_NPROC', mpinproc) setenv("CRTM_FIX","/lfs/h2/emc/da/noscrub/emc.da/GDASApp/fix/crtm/2.4.0") -setenv("GDASAPP_TESTDATA","/lfs/h2/emc/da/noscrub/emc.da/GDASApp/data") -setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/lfs/h2/emc/da/noscrub/emc.da/GDASApp/data/test") +setenv("GDASAPP_TESTDATA","/lfs/h2/emc/da/noscrub/emc.da/GDASApp/testdata") +setenv("GDASAPP_UNIT_TEST_DATA_PATH", "/lfs/h2/emc/da/noscrub/emc.da/GDASApp/unittestdata") whatis("Name: ".. pkgName) whatis("Version: ".. pkgVersion) diff --git a/scripts/exgdas_global_marine_analysis_prep.py b/scripts/exgdas_global_marine_analysis_prep.py index bb9baeaf6..dba491868 100755 --- a/scripts/exgdas_global_marine_analysis_prep.py +++ b/scripts/exgdas_global_marine_analysis_prep.py @@ -177,7 +177,7 @@ def parse_obs_list_file(): ensroot = os.getenv('COM_OCEAN_HISTORY_PREV') ensdir = os.path.join(os.getenv('COM_OCEAN_HISTORY_PREV'), '..', '..', '..', '..', '..', f'enkf{RUN}.{PDY}', f'{gcyc}', f'mem{str(mem).zfill(3)}', - 'model_data', domain, 'history') + 'model', domain, 'history') ensdir_real = os.path.realpath(ensdir) f009 = f'enkfgdas.{domain}.t{gcyc}z.inst.f009.nc' diff --git a/test/aero/global-workflow/jjob_var_init.sh b/test/aero/global-workflow/jjob_var_init.sh index 274a55922..ea785335c 100755 --- a/test/aero/global-workflow/jjob_var_init.sh +++ b/test/aero/global-workflow/jjob_var_init.sh @@ -76,7 +76,7 @@ done # Copy model bacgkround on tiles -dpath=gdas.$gPDY/$gcyc/model_data/atmos +dpath=gdas.$gPDY/$gcyc/model/atmos COM_ATMOS_RESTART_PREV_DIRNAME=$(dirname $COM_ATMOS_RESTART_PREV) if [ -d $COM_ATMOS_RESTART_PREV_DIRNAME/restart ]; then rm -rf $COM_ATMOS_RESTART_PREV_DIRNAME/restart diff --git a/test/atm/global-workflow/jjob_ens_init.sh b/test/atm/global-workflow/jjob_ens_init.sh index 68e75820e..e90d4f76b 100755 --- a/test/atm/global-workflow/jjob_ens_init.sh +++ b/test/atm/global-workflow/jjob_ens_init.sh @@ -95,13 +95,13 @@ for imem in $(seq 1 $NMEM_ENS); do COM_ATMOS_RESTART_PREV_ENS:COM_ATMOS_RESTART_TMPL COM_ATMOS_RESTART_PREV_DIRNAME_ENS=$(dirname $COM_ATMOS_RESTART_PREV_ENS) - source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model_data/atmos + source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos target=$COM_ATMOS_RESTART_PREV_DIRNAME_ENS mkdir -p $target rm -rf $target/restart ln -fs $source/restart $target/ - source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model_data/atmos/history + source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history target=$COM_ATMOS_HISTORY_PREV_ENS mkdir -p $target rm -rf $target/enkfgdas.t${gcyc}z.atmf006.nc diff --git a/test/atm/global-workflow/jjob_var_init.sh b/test/atm/global-workflow/jjob_var_init.sh index 38d70bce1..6ca53557b 100755 --- a/test/atm/global-workflow/jjob_var_init.sh +++ b/test/atm/global-workflow/jjob_var_init.sh @@ -88,7 +88,7 @@ for file in $flist; do done # Link atmospheric background on gaussian grid -dpath=gdas.$gPDY/$gcyc/model_data/atmos/history +dpath=gdas.$gPDY/$gcyc/model/atmos/history mkdir -p $COM_ATMOS_HISTORY_PREV flist="atmf006.nc" for file in $flist; do @@ -96,7 +96,7 @@ for file in $flist; do done # Link atmospheric bacgkround on tiles -dpath=gdas.$gPDY/$gcyc/model_data/atmos +dpath=gdas.$gPDY/$gcyc/model/atmos COM_ATMOS_RESTART_PREV_DIRNAME=$(dirname $COM_ATMOS_RESTART_PREV) mkdir -p $COM_ATMOS_RESTART_PREV_DIRNAME flist="restart" @@ -115,13 +115,13 @@ for imem in $(seq 1 $NMEM_ENS); do COM_ATMOS_RESTART_PREV_ENS:COM_ATMOS_RESTART_TMPL COM_ATMOS_RESTART_PREV_DIRNAME_ENS=$(dirname $COM_ATMOS_RESTART_PREV_ENS) - source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model_data/atmos + source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos target=$COM_ATMOS_RESTART_PREV_DIRNAME_ENS mkdir -p $target rm -rf $target/restart ln -fs $source/restart $target/ - source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model_data/atmos/history + source=$GDASAPP_TESTDATA/lowres/$dpath/$memchar/model/atmos/history target=$COM_ATMOS_HISTORY_PREV_ENS mkdir -p $target rm -rf $target/enkfgdas.t${gcyc}z.atmf006.nc diff --git a/test/snow/apply_jedi_incr.sh b/test/snow/apply_jedi_incr.sh index d00bcb2fc..d665a3c1c 100755 --- a/test/snow/apply_jedi_incr.sh +++ b/test/snow/apply_jedi_incr.sh @@ -16,7 +16,7 @@ GHR=$(date +%H -d "$YY$MM$DD $HH - 6 hours") EXECDIR=$project_source_dir/build/bin WORKDIR=$project_binary_dir/test/snow/apply_jedi_incr -RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model_data/atmos/restart +RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model/atmos/restart INCDIR=$GDASAPP_TESTDATA/snow/C${RES} export TPATH="$GDASAPP_TESTDATA/snow/C${RES}" diff --git a/test/snow/create_bkg_ens.sh b/test/snow/create_bkg_ens.sh index bc2232654..3d109605b 100755 --- a/test/snow/create_bkg_ens.sh +++ b/test/snow/create_bkg_ens.sh @@ -16,7 +16,7 @@ GYMD=$(date +%Y%m%d -d "$YY$MM$DD $HH - 6 hours") GHR=$(date +%H -d "$YY$MM$DD $HH - 6 hours") WORKDIR=$project_binary_dir/test/snow/create_jedi_ens -RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model_data/atmos/restart +RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model/atmos/restart GFSv17=NO DAtype=letkfoi_snow diff --git a/test/snow/letkfoi_snowda.sh b/test/snow/letkfoi_snowda.sh index 8b09ebca4..8e6cbdce0 100755 --- a/test/snow/letkfoi_snowda.sh +++ b/test/snow/letkfoi_snowda.sh @@ -16,7 +16,7 @@ GHR=$(date +%H -d "$YY$MM$DD $HH - 6 hours") EXECDIR=$project_source_dir/build/bin WORKDIR=$project_binary_dir/test/snow/letkfoi_snowda -RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model_data/atmos/restart +RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model/atmos/restart export OBSDIR=$GDASAPP_TESTDATA/snow GFSv17=${GFSv17:-"YES"} diff --git a/test/snow/test_imsproc.sh b/test/snow/test_imsproc.sh index 490c814c1..01cd6ec61 100755 --- a/test/snow/test_imsproc.sh +++ b/test/snow/test_imsproc.sh @@ -17,7 +17,7 @@ DOY=$(date +%j -d "$YY$MM$DD + 1 day") EXECDIR=$project_source_dir/build/bin WORKDIR=$project_binary_dir/test/snow/ims_proc -RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model_data/atmos/restart +RSTDIR=$GDASAPP_TESTDATA/lowres/gdas.$GYMD/$GHR/model/atmos/restart export OBSDIR=$GDASAPP_TESTDATA/snow/snow_ice_cover export TSTUB="oro_C${RES}.mx100" diff --git a/test/soca/gw/prep.sh b/test/soca/gw/prep.sh index 2cefdc39d..c0717f243 100755 --- a/test/soca/gw/prep.sh +++ b/test/soca/gw/prep.sh @@ -11,29 +11,29 @@ ${project_source_dir}/test/soca/gw/static.sh $project_binary_dir $project_source COM=${project_binary_dir}/test/soca/gw/COM/gdas.20180415 -mkdir -p ${COM}/06/model_data/ice/history -mkdir -p ${COM}/06/model_data/ice/restart -mkdir -p ${COM}/06/model_data/ocean/history -mkdir -p ${COM}/06/model_data/atmos/analysis +mkdir -p ${COM}/06/model/ice/history +mkdir -p ${COM}/06/model/ice/restart +mkdir -p ${COM}/06/model/ocean/history +mkdir -p ${COM}/06/model/atmos/analysis # copy CICE6 restart ice_rst=${project_binary_dir}/test/testdata/iced.2019-04-15-43200.nc hist_icef=${project_binary_dir}/test/testdata/cice_hist.nc -cp ${ice_rst} ${COM}/06/model_data/ice/restart/20180415.120000.cice_model.res.nc +cp ${ice_rst} ${COM}/06/model/ice/restart/20180415.120000.cice_model.res.nc # invent MOM6 and CICE6 history files i=3 lof=`ls ${project_binary_dir}/test/testdata/ocn_da_*` for ocnf in $lof; do - cp $ocnf ${COM}/06/model_data/ocean/history/gdas.ocean.t06z.inst.f00$i.nc - cp $hist_icef ${COM}/06/model_data/ice/history/gdas.ice.t06z.inst.f00$i.nc + cp $ocnf ${COM}/06/model/ocean/history/gdas.ocean.t06z.inst.f00$i.nc + cp $hist_icef ${COM}/06/model/ice/history/gdas.ice.t06z.inst.f00$i.nc i=$(($i+1)) done # invent background error for day in $(seq 1 2 9); do - cp ${COM}/06/model_data/ocean/history/gdas.ocean.t06z.inst.f003.nc \ + cp ${COM}/06/model/ocean/history/gdas.ocean.t06z.inst.f003.nc \ ${project_binary_dir}/soca_static/bkgerr/stddev/ocn.ensstddev.fc.2019-04-0${day}T00:00:00Z.PT0S.nc cp ${project_source_dir}/sorc/soca/test/Data/72x35x25/ice.bkgerror.nc \ ${project_binary_dir}/soca_static/bkgerr/stddev/ice.ensstddev.fc.2019-04-0${day}T00:00:00Z.PT0S.nc @@ -43,7 +43,7 @@ done clim_ens_dir=${project_binary_dir}/soca_static/bkgerr/ens/2019-07-10T00Z mkdir -p ${clim_ens_dir} for domain in "ocean" "ice"; do - list_of_ocn_fcst=$(ls ${COM}/06/model_data/${domain}/history/gdas.${domain}.t06z.inst.f*.nc) + list_of_ocn_fcst=$(ls ${COM}/06/model/${domain}/history/gdas.${domain}.t06z.inst.f*.nc) counter=1 for file in ${list_of_ocn_fcst}; do file_name=${domain}.${counter}.nc @@ -65,13 +65,13 @@ for mem in {1..4} do echo "member: $mem" # ocean member - oceandir=${COMENS}/06/mem00${mem}/model_data/ocean/history + oceandir=${COMENS}/06/mem00${mem}/model/ocean/history mkdir -p $oceandir cp ${clim_ens_dir}/ocean.${mem}.nc $oceandir/enkfgdas.ocean.t06z.inst.f009.nc cp ${clim_ens_dir}/ocean.${mem}.nc $oceandir/enkfgdas.ocean.t06z.inst.f006.nc # ice member - icedir=${COMENS}/06/mem00${mem}/model_data/ice/history + icedir=${COMENS}/06/mem00${mem}/model/ice/history mkdir -p $icedir cp ${clim_ens_dir}/ice.${mem}.nc $icedir/enkfgdas.ice.t06z.inst.f009.nc cp ${clim_ens_dir}/ice.${mem}.nc $icedir/enkfgdas.ice.t06z.inst.f006.nc diff --git a/ush/soca/marine_recenter.py b/ush/soca/marine_recenter.py index 2fa500e73..5572e2c76 100644 --- a/ush/soca/marine_recenter.py +++ b/ush/soca/marine_recenter.py @@ -143,7 +143,7 @@ def initialize(self): f'enkf{RUN}.{gPDYstr}', f'{gcyc}', f'mem{str(mem).zfill(3)}', - 'model_data', + 'model', domain, 'history') mem_dir_real = os.path.realpath(mem_dir) diff --git a/ush/soca/run_jjobs.py b/ush/soca/run_jjobs.py index 113fa0bfb..175262e0b 100755 --- a/ush/soca/run_jjobs.py +++ b/ush/soca/run_jjobs.py @@ -185,10 +185,10 @@ def copy_bkgs(self): self.f.write("mkdir -p ${COM_ICE_HISTORY_PREV}/\n") self.f.write("mkdir -p ${COM_ICE_RESTART_PREV}/\n") - model_data = os.path.join(self.com_src, f"{self.RUN}.{self.gPDY}", self.gcyc, "model_data") - com_ocean_history_src = os.path.join(model_data, 'ocean', 'history') - com_ice_history_src = os.path.join(model_data, 'ice', 'history') - com_ice_restart_src = os.path.join(model_data, 'ice', 'restart') + model = os.path.join(self.com_src, f"{self.RUN}.{self.gPDY}", self.gcyc, "model") + com_ocean_history_src = os.path.join(model, 'ocean', 'history') + com_ice_history_src = os.path.join(model, 'ice', 'history') + com_ice_restart_src = os.path.join(model, 'ice', 'restart') self.f.write(f"cp {com_ocean_history_src}/*.ocean.*.nc $COM_OCEAN_HISTORY_PREV \n") self.f.write(f"cp {com_ice_history_src}/*.ice.*.nc $COM_ICE_HISTORY_PREV \n") self.f.write(f"cp {com_ice_restart_src}/*cice_model*.nc $COM_ICE_RESTART_PREV \n")