Merge branch 'develop' into feature/com2comin

NOAA-EMC · Jun 27, 2024 · 5638f25 · 5638f25
2 parents b45eddb + 00089d4
commit 5638f25
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 39 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -88,15 +88,15 @@ 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
    ln -fs $GDASAPP_TESTDATA/lowres/$dpath/${gprefix}.${file} $COM_ATMOS_HISTORY_PREV/${gprefix}.${file}
 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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")