Merge pull request #8 from KateFriedman-NOAA/feature/marinevar

Introduce `BASE_DATA` and update `DMPDIR` for experimental obs
NOAA-EMC · Sep 24, 2024 · 771efe4 · 771efe4
2 parents 66c09f9 + 0d4456e
commit 771efe4
Show file tree

Hide file tree

Showing 14 changed files with 17 additions and 24 deletions.
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
@@ -48,6 +48,9 @@ export NOSCRUB="@NOSCRUB@"
 # Base directories for various builds
 export BASE_GIT="@BASE_GIT@"
 
+# Base directory for staged data
+export BASE_DATA="@BASE_DATA@"
+
 # Toggle to turn on/off GFS downstream processing.
 export DO_BUFRSND="@DO_BUFRSND@"     # BUFR sounding products
 export DO_GEMPAK="@DO_GEMPAK@"       # GEMPAK products

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -63,6 +63,9 @@ export NOSCRUB="@NOSCRUB@"
 # Base directories for various builds
 export BASE_GIT="@BASE_GIT@"
 
+# Base directory for staged data
+export BASE_DATA="@BASE_DATA@"
+
 # Toggle to turn on/off GFS downstream processing.
 export DO_GOES="@DO_GOES@"               # GOES products
 export DO_BUFRSND="@DO_BUFRSND@"         # BUFR sounding products

diff --git a/parm/config/gfs/yaml/defaults.yaml b/parm/config/gfs/yaml/defaults.yaml
@@ -61,4 +61,4 @@ prepoceanobs:
   SOCA_INPUT_FIX_DIR: "${FIXgfs}/gdas/soca/72x35x25/soca"
   SOCA_OBS_LIST: "${PARMgfs}/gdas/soca/obs/obs_list.yaml"  # TODO: This is also repeated in ocnanal
   OBSPREP_YAML: "${PARMgfs}/gdas/soca/obsprep/obsprep_config.yaml"
-  DMPDIR: "${PARMgfs}/gdas/experimental_obs"
+  DMPDIR: "${BASE_DATA}/experimental_obs"
diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh
@@ -275,29 +275,6 @@ if [[ -d "${HOMEgfs}/sorc/gdas.cd/build" ]]; then
   done
 fi
 
-#------------------------------
-#-- Link the JEDI/SOCA experimental observations
-#------------------------------
-case "${machine}" in
-  "wcoss2")   EXPOBS_DIR="" ;;
-  "hera")     EXPOBS_DIR="/scratch1/NCEPDEV/global/glopara/data/experimental_obs" ;;
-  "orion")    EXPOBS_DIR="/work/noaa/global/glopara/data/experimental_obs" ;;
-  "hercules") EXPOBS_DIR="/work/noaa/global/glopara/data/experimental_obs" ;;
-  "jet")      EXPOBS_DIR="" ;;
-  "s4")       EXPOBS_DIR="" ;;
-  "gaea")     EXPOBS_DIR="" ;;
-  "noaacloud") EXPOBS_DIR="" ;;
-  *)
-    echo "FATAL: Unknown target machine ${machine}, couldn't set EXPOBS_DIR"
-    exit 1
-    ;;
-esac
-if [[ -d "${EXPOBS_DIR}" ]]; then
-  if [[ ! -L "${HOMEgfs}/parm/gdas/experimental_obs" ]]; then
-    ${LINK_OR_COPY} "${EXPOBS_DIR}" "${HOMEgfs}/parm/gdas/experimental_obs"
-  fi
-fi
-
 #------------------------------
 #--add DA Monitor file (NOTE: ensure to use correct version)
 #------------------------------

diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
@@ -18,6 +18,7 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
+BASE_DATA: '/bucket/global-workflow-shared-data'
 BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AWS.

diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml
@@ -18,6 +18,7 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
+BASE_DATA: '/bucket/global-workflow-shared-data'
 BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AZURE.

diff --git a/workflow/hosts/gaea.yaml b/workflow/hosts/gaea.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/git'
 DMPDIR: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/dump'
+BASE_DATA: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data'
 BASE_IC: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/nwpara'
 COMROOT: '/gpfs/f5/ufs-ard/world-shared/global/glopara/data/com'

diff --git a/workflow/hosts/googlepw.yaml b/workflow/hosts/googlepw.yaml
@@ -18,6 +18,7 @@ CHGRP_RSTPROD: 'YES'
 CHGRP_CMD: 'chgrp rstprod' # TODO: This is not yet supported.
 HPSSARCH: 'NO'
 HPSS_PROJECT: emc-global #TODO: See `ATARDIR` below.
+BASE_DATA: '/bucket/global-workflow-shared-data'
 BASE_IC: '/bucket/global-workflow-shared-data/ICSDIR'
 LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from GOOGLE.

diff --git a/workflow/hosts/hera.yaml b/workflow/hosts/hera.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/scratch1/NCEPDEV/global/glopara/git'
 DMPDIR: '/scratch1/NCEPDEV/global/glopara/dump'
+BASE_DATA: '/scratch1/NCEPDEV/global/glopara/data'
 BASE_IC: '/scratch1/NCEPDEV/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/scratch1/NCEPDEV/global/glopara/nwpara'
 COMINsyn: '/scratch1/NCEPDEV/global/glopara/com/gfs/prod/syndat'

diff --git a/workflow/hosts/hercules.yaml b/workflow/hosts/hercules.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/work/noaa/global/glopara/git_rocky9'
 DMPDIR: '/work/noaa/rstprod/dump'
+BASE_DATA: '/work/noaa/global/glopara/data'
 BASE_IC: '/work/noaa/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/work/noaa/global/glopara/nwpara'
 COMINsyn: '/work/noaa/global/glopara/com/gfs/prod/syndat'

diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/lfs4/HFIP/hfv3gfs/glopara/git'
 DMPDIR: '/lfs4/HFIP/hfv3gfs/glopara/dump'
+BASE_DATA: '/lfs5/HFIP/hfv3gfs/glopara/data'
 BASE_IC: '/mnt/lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR'
 PACKAGEROOT: '/lfs4/HFIP/hfv3gfs/glopara/nwpara'
 COMINsyn: '/lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat'

diff --git a/workflow/hosts/orion.yaml b/workflow/hosts/orion.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/work/noaa/global/glopara/git_rocky9'
 DMPDIR: '/work/noaa/rstprod/dump'
+BASE_DATA: '/work/noaa/global/glopara/data'
 BASE_IC: '/work/noaa/global/glopara/data/ICSDIR'
 PACKAGEROOT: '/work/noaa/global/glopara/nwpara'
 COMINsyn: '/work/noaa/global/glopara/com/gfs/prod/syndat'

diff --git a/workflow/hosts/s4.yaml b/workflow/hosts/s4.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/data/prod/glopara/git'
 DMPDIR: '/data/prod/glopara/dump'
+BASE_DATA: '/data/prod/glopara'
 BASE_IC: '/data/prod/glopara/coupled_ICs'
 PACKAGEROOT: '/data/prod/glopara/nwpara'
 COMINsyn: '/data/prod/glopara/com/gfs/prod/syndat'

diff --git a/workflow/hosts/wcoss2.yaml b/workflow/hosts/wcoss2.yaml
@@ -1,5 +1,6 @@
 BASE_GIT: '/lfs/h2/emc/global/save/emc.global/git'
 DMPDIR: '/lfs/h2/emc/dump/noscrub/dump'
+BASE_DATA: '/lfs/h2/emc/global/noscrub/emc.global/data'
 BASE_IC: '/lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR'
 PACKAGEROOT: '${PACKAGEROOT:-"/lfs/h1/ops/prod/packages"}'
 COMINsyn: '/lfs/h1/ops/prod/com/gfs/v16.3/syndat'