additional change for com structure

ufs-community · Mar 7, 2024 · 507cb8a · 507cb8a
1 parent 5e15fb9
commit 507cb8a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/parm/land_analysis_era5_hera.yaml b/parm/land_analysis_era5_hera.yaml
@@ -25,16 +25,16 @@ workflow:
     DAtype: "letkfoi_snow"
     SNOWDEPTHVAR: "snwdph"
     TSTUB: "oro_C96.mx100"
-    WORKDIR: "&EXP_BASEDIR;/workdir"
+    WORKDIR: "&EXP_BASEDIR;/workdir/run_&FORCING;"
     CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow"
     EXECdir: "&CYCLEDIR;/exec"
-    OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;"
-    LOG: "&EXP_BASEDIR;/comout/output/logs"
+    OUTDIR: "&EXP_BASEDIR;/com/&NET;/&model_ver;/run_&FORCING;"
+    LOGDIR: "&EXP_BASEDIR;/com/output/logs/run_&FORCING;"
     PATHRT: "&EXP_BASEDIR;"
     CTIME:  "<cyclestr>@Y@m@d@H</cyclestr>"
     PTIME:  "<cyclestr offset='-1:00:00'>@Y@m@d@H</cyclestr>"
     NTIME:  "<cyclestr offset='01:00:00'>@Y@m@d@H</cyclestr>"
-  log: "&LOG;/workflow.log"
+  log: "&LOGDIR;/workflow.log"
   tasks:
     task_prepexp:
       envars:

diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml
@@ -25,11 +25,11 @@ workflow:
     DAtype: "letkfoi_snow"
     SNOWDEPTHVAR: "snwdph"
     TSTUB: "oro_C96.mx100"
-    WORKDIR: "&EXP_BASEDIR;/workdir"
+    WORKDIR: "&EXP_BASEDIR;/workdir/run_&FORCING;"
     CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow"
     EXECdir: "&CYCLEDIR;/exec"
-    OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;"
-    LOGDIR: "&EXP_BASEDIR;/comout/output/logs"
+    OUTDIR: "&EXP_BASEDIR;/com/&NET;/&model_ver;/run_&FORCING;"
+    LOGDIR: "&EXP_BASEDIR;/com/output/logs/run_&FORCING;"
     PATHRT: "&EXP_BASEDIR;"
     CTIME:  "<cyclestr>@Y@m@d@H</cyclestr>"
     PTIME:  "<cyclestr offset='-1:00:00'>@Y@m@d@H</cyclestr>"

diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml
@@ -25,16 +25,16 @@ workflow:
     DAtype: "letkfoi_snow"
     SNOWDEPTHVAR: "snwdph"
     TSTUB: "oro_C96.mx100"
-    WORKDIR: "&EXP_BASEDIR;/workdir"
+    WORKDIR: "&EXP_BASEDIR;/workdir/run_&FORCING;"
     CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow"
     EXECdir: "&CYCLEDIR;/exec"
-    OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;"
-    LOG: "&EXP_BASEDIR;/comout/output/logs"
+    OUTDIR: "&EXP_BASEDIR;/com/&NET;/&model_ver;/run_&FORCING;"
+    LOGDIR: "&EXP_BASEDIR;/com/output/logs/run_&FORCING;"
     PATHRT: "&EXP_BASEDIR;"
     CTIME:  "<cyclestr>@Y@m@d@H</cyclestr>"
     PTIME:  "<cyclestr offset='-24:00:00'>@Y@m@d@H</cyclestr>"
     NTIME:  "<cyclestr offset='24:00:00'>@Y@m@d@H</cyclestr>"
-  log: "&LOG;/workflow.log"
+  log: "&LOGDIR;/workflow.log"
   tasks:
     task_prepexp:
       envars:

diff --git a/parm/land_analysis_gswp3_orion.yaml b/parm/land_analysis_gswp3_orion.yaml
@@ -25,16 +25,16 @@ workflow:
     DAtype: "letkfoi_snow"
     SNOWDEPTHVAR: "snwdph"
     TSTUB: "oro_C96.mx100"
-    WORKDIR: "&EXP_BASEDIR;/workdir"
+    WORKDIR: "&EXP_BASEDIR;/workdir/run_&FORCING;"
     CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow"
     EXECdir: "&CYCLEDIR;/exec"
-    OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;"
-    LOG: "&EXP_BASEDIR;/comout/output/logs"
+    OUTDIR: "&EXP_BASEDIR;/com/&NET;/&model_ver;/run_&FORCING;"
+    LOGDIR: "&EXP_BASEDIR;/com/output/logs/run_&FORCING;"
     PATHRT: "&EXP_BASEDIR;"
     CTIME:  "<cyclestr>@Y@m@d@H</cyclestr>"
     PTIME:  "<cyclestr offset='-24:00:00'>@Y@m@d@H</cyclestr>"
     NTIME:  "<cyclestr offset='24:00:00'>@Y@m@d@H</cyclestr>"
-  log: "&LOG;/workflow.log"
+  log: "&LOGDIR;/workflow.log"
   tasks:
     task_prepexp:
       envars:

diff --git a/parm/run_without_rocoto.sh b/parm/run_without_rocoto.sh
@@ -13,13 +13,15 @@
 export MACHINE="hera"
 export ACCOUNT="nems"
 export FORCING="gswp3"
+export NET="landda"
+export model_ver="v1.2.1"
 
 if [ "${MACHINE}" = "hera" ]; then
-  export EXP_BASEDIR="/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/landda_nonrocoto"
+  export EXP_BASEDIR="/scratch2/NAGAPE/epic/{USER}/landda_nonrocoto"
   export JEDI_INSTALL="/scratch2/NAGAPE/epic/UFS_Land-DA/jedi"
   export LANDDA_INPUTS="/scratch2/NAGAPE/epic/UFS_Land-DA/inputs"
 elif [ "${MACHINE}" = "orion" ]; then
-  export EXP_BASEDIR="/work/noaa/epic/chjeon/landda_nonrocoto"
+  export EXP_BASEDIR="/work/noaa/epic/{USER}/landda_nonrocoto"
   export JEDI_INSTALL="/work/noaa/epic/UFS_Land-DA/jedi"
   export LANDDA_INPUTS="/work/noaa/epic/UFS_Land-DA/inputs"
 fi
@@ -33,11 +35,11 @@ export fv3bundle_vn="psl_develop"
 export DAtype="letkfoi_snow"
 export SNOWDEPTHVAR="snwdph"
 export TSTUB="oro_C96.mx100"
-export WORKDIR="${EXP_BASEDIR}/workdir"
+export WORKDIR="${EXP_BASEDIR}/workdir/run_&FORCING;"
 export CYCLEDIR="${EXP_BASEDIR}/land-DA_workflow"
 export EXECdir="${CYCLEDIR}/exec"
-export OUTDIR="${EXP_BASEDIR}/landda_expts/DA_${FORCING}_test"
-export LOG="${EXP_BASEDIR}/tests"
+export OUTDIR="${EXP_BASEDIR}/com/${NET}/${model_ver}/run_${FORCING}"
+export LOGDIR="${EXP_BASEDIR}/com/output/logs"
 export PATHRT="${EXP_BASEDIR}"
 
 export ATMOS_FORC="${FORCING}"