Fix wrong j-job name for run_ana task (#68)

* correst j-job script call for run_ana * add machine specific yaml * change path of yaml
ufs-community · Mar 2, 2024 · 4befa0f · 4befa0f
1 parent 0a34bd7
commit 4befa0f
Show file tree

Hide file tree

Showing 5 changed files with 178 additions and 7 deletions.
diff --git a/parm/land_analysis.yaml → parm/land_analysis_era5_hera.yaml b/parm/land_analysis.yaml → parm/land_analysis_era5_hera.yaml
@@ -8,9 +8,9 @@ workflow:
       spec: 201912210000 201912210000 24:00:00
   entities:
     MACHINE: "hera"
-    ACCOUNT: "naqfc"
+    ACCOUNT: "nems"
     EXP_NAME: "LETKF"
-    EXP_BASEDIR: "/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/LAND-DA-WORKFLOW"
+    EXP_BASEDIR: "/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/landda_fixjjob"
     JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA/jedi"
     LANDDA_INPUTS: "/scratch2/NAGAPE/epic/UFS_Land-DA/inputs"
     FORCING: "era5"
@@ -128,7 +128,7 @@ workflow:
         NPROC_JEDI: "&NPROCS_ANA;"
         JEDI_INSTALL: "&JEDI_INSTALL;"
       account: "&ACCOUNT;"
-      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_OBS"
+      command: "&CYCLEDIR;/jobs/JLANDDA_RUN_ANA"
       jobname: runana
       nodes: "1:ppn=&NPROCS_ANA;"
       walltime: 00:15:00

diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml
@@ -0,0 +1,171 @@
+workflow:
+  attrs:
+    realtime: false
+    scheduler: slurm
+  cycledef:
+    - attrs:
+        group: epic
+      spec: 201912210000 201912210000 24:00:00
+  entities:
+    MACHINE: "orion"
+    ACCOUNT: "epic"
+    EXP_NAME: "LETKF"
+    EXP_BASEDIR: "/work/noaa/epic/chjeon/landda_fixjjob"
+    JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA/jedi"
+    LANDDA_INPUTS: "/work/noaa/epic/UFS_Land-DA/inputs"
+    FORCING: "era5"
+    RES: "96"
+    FCSTHR: "24"
+    NPROCS_ANA: "6"
+    NPROCS_FCST: "6"
+    OBS_TYPES: "GHCN"
+    fv3bundle_vn: "psl_develop"
+    DAtype: "letkfoi_snow"
+    SNOWDEPTHVAR: "snwdph"
+    TSTUB: "oro_C96.mx100"
+    WORKDIR: "&EXP_BASEDIR;/workdir"
+    CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow"
+    EXECdir: "&CYCLEDIR;/exec"
+    OUTDIR: "&EXP_BASEDIR;/landda_expts/DA_era5_test"
+    LOG: "&EXP_BASEDIR;/tests"
+    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"
+  tasks:
+    task_prepexp:
+      envars:
+        MACHINE: "&MACHINE;"
+        ACCOUNT: "&ACCOUNT;"
+        EXP_NAME: "&EXP_NAME;"
+        LANDDA_INPUTS: "&LANDDA_INPUTS;"
+        ATMOS_FORC: "&FORCING;"
+        RES: "&RES;"
+        TSTUB: "&TSTUB;"
+        WORKDIR: "&WORKDIR;"
+        CYCLEDIR: "&CYCLEDIR;"
+        EXECdir: "&EXECdir;"
+        OUTDIR: "&OUTDIR;"
+        CTIME: "&CTIME;"
+        PTIME: "&PTIME;"
+      account: "&ACCOUNT;"
+      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_EXP"
+      jobname: prepexp
+      cores: 1
+      walltime: 00:02:00
+      queue: batch
+    task_prepobs:
+      envars:
+        OBS_TYPES: "&OBS_TYPES;"
+        MACHINE: "&MACHINE;"
+        ACCOUNT: "&ACCOUNT;"
+        EXP_NAME: "&EXP_NAME;"
+        LANDDA_INPUTS: "&LANDDA_INPUTS;"
+        ATMOS_FORC: "&FORCING;"
+        WORKDIR: "&WORKDIR;"
+        CYCLEDIR: "&CYCLEDIR;"
+        EXECdir: "&EXECdir;"
+        OUTDIR: "&OUTDIR;"
+        CTIME: "&CTIME;"
+        PTIME: "&PTIME;"
+      account: "&ACCOUNT;"
+      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_OBS"
+      jobname: prepobs
+      cores: 1
+      walltime: 00:02:00
+      queue: batch
+      dependency:
+        taskdep:
+          attrs:
+            task: prepexp
+    task_prepbmat:
+      envars:
+        MACHINE: "&MACHINE;"
+        ACCOUNT: "&ACCOUNT;"
+        EXP_NAME: "&EXP_NAME;"
+        LANDDA_INPUTS: "&LANDDA_INPUTS;"
+        ATMOS_FORC: "&FORCING;"
+        WORKDIR: "&WORKDIR;"
+        CYCLEDIR: "&CYCLEDIR;"
+        EXECdir: "&EXECdir;"
+        OUTDIR: "&OUTDIR;"
+        CTIME: "&CTIME;"
+        PTIME: "&PTIME;"
+        fv3bundle_vn: "&fv3bundle_vn;"
+        DAtype: "&DAtype;"
+        SNOWDEPTHVAR: "&SNOWDEPTHVAR;"
+      account: "&ACCOUNT;"
+      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_BMAT"
+      jobname: prepbmat
+      cores: 1
+      walltime: 00:02:00
+      queue: batch
+      dependency:
+        taskdep:
+          attrs:
+            task: prepobs
+    task_runana:
+      envars:
+        OBS_TYPES: "&OBS_TYPES;"
+        MACHINE: "&MACHINE;"
+        ACCOUNT: "&ACCOUNT;"
+        EXP_NAME: "&EXP_NAME;"
+        LANDDA_INPUTS: "&LANDDA_INPUTS;"
+        ATMOS_FORC: "&FORCING;"
+        RES: "&RES;"
+        TSTUB: "&TSTUB;"
+        WORKDIR: "&WORKDIR;"
+        CYCLEDIR: "&CYCLEDIR;"
+        EXECdir: "&EXECdir;"
+        OUTDIR: "&OUTDIR;"
+        CTIME: "&CTIME;"
+        PTIME: "&PTIME;"
+        NTIME: "&NTIME;"
+        fv3bundle_vn: "&fv3bundle_vn;"
+        DAtype: "&DAtype;"
+        SNOWDEPTHVAR: "&SNOWDEPTHVAR;"
+        NPROC_JEDI: "&NPROCS_ANA;"
+        JEDI_INSTALL: "&JEDI_INSTALL;"
+      account: "&ACCOUNT;"
+      command: "&CYCLEDIR;/jobs/JLANDDA_RUN_ANA"
+      jobname: runana
+      nodes: "1:ppn=&NPROCS_ANA;"
+      walltime: 00:15:00
+      queue: batch
+      dependency:
+        taskdep:
+          attrs:
+            task: prepbmat
+    task_runfcst:
+      envars:
+        OBS_TYPES: "&OBS_TYPES;"
+        MACHINE: "&MACHINE;"
+        ACCOUNT: "&ACCOUNT;"
+        EXP_NAME: "&EXP_NAME;"
+        LANDDA_INPUTS: "&LANDDA_INPUTS;"
+        ATMOS_FORC: "&FORCING;"
+        RES: "&RES;"
+        TSTUB: "&TSTUB;"
+        WORKDIR: "&WORKDIR;"
+        CYCLEDIR: "&CYCLEDIR;"
+        EXECdir: "&EXECdir;"
+        OUTDIR: "&OUTDIR;"
+        CTIME: "&CTIME;"
+        PTIME: "&PTIME;"
+        NTIME: "&NTIME;"
+        fv3bundle_vn: "&fv3bundle_vn;"
+        DAtype: "&DAtype;"
+        SNOWDEPTHVAR: "&SNOWDEPTHVAR;"
+        JEDI_INSTALL: "&JEDI_INSTALL;"
+        FCSTHR: "&FCSTHR;"
+      account: "&ACCOUNT;"
+      command: "&CYCLEDIR;/jobs/JLANDDA_RUN_FCST"
+      jobname: runfcst
+      nodes: "1:ppn=&NPROCS_FCST;"
+      walltime: 00:30:00
+      queue: batch
+      dependency:
+        taskdep:
+          attrs:
+            task: runana
diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml
@@ -128,7 +128,7 @@ workflow:
         NPROC_JEDI: "&NPROCS_ANA;"
         JEDI_INSTALL: "&JEDI_INSTALL;"
       account: "&ACCOUNT;"
-      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_OBS"
+      command: "&CYCLEDIR;/jobs/JLANDDA_RUN_ANA"
       jobname: runana
       nodes: "1:ppn=&NPROCS_ANA;"
       walltime: 00:15:00

diff --git a/parm/land_analysis_gswp3_orion.yaml b/parm/land_analysis_gswp3_orion.yaml
@@ -10,7 +10,7 @@ workflow:
     MACHINE: "orion"
     ACCOUNT: "epic"
     EXP_NAME: "LETKF"
-    EXP_BASEDIR: "/work/noaa/epic/chjeon/landda_gswp3"
+    EXP_BASEDIR: "/work/noaa/epic/chjeon/landda_fixjjob"
     JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA/jedi"
     LANDDA_INPUTS: "/work/noaa/epic/UFS_Land-DA/inputs"
     FORCING: "gswp3"
@@ -128,7 +128,7 @@ workflow:
         NPROC_JEDI: "&NPROCS_ANA;"
         JEDI_INSTALL: "&JEDI_INSTALL;"
       account: "&ACCOUNT;"
-      command: "&CYCLEDIR;/jobs/JLANDDA_PREP_OBS"
+      command: "&CYCLEDIR;/jobs/JLANDDA_RUN_ANA"
       jobname: runana
       nodes: "1:ppn=&NPROCS_ANA;"
       walltime: 00:15:00

diff --git a/parm/land_analysis_test.xml b/parm/land_analysis_test.xml
@@ -208,7 +208,7 @@
     <nodes>1:ppn=&NPROCS_ANA;</nodes>
     <queue>batch</queue>
     <walltime>00:15:00</walltime>
-    <command>&CYCLEDIR;/jobs/JLANDDA_PREP_OBS</command>
+    <command>&CYCLEDIR;/jobs/JLANDDA_RUN_ANA</command>
     <jobname>runana</jobname>
     <envar>
       <name>OBS_TYPES</name>