Merge branch 'ufs-community:develop' into text/us-215

ufs-community · Aug 8, 2024 · 418761d · 418761d
2 parents a492e38 + 3090901
commit 418761d
Show file tree

Hide file tree

Showing 23 changed files with 96 additions and 739 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -8,9 +8,7 @@ Provide a detailed description of what this PR does. What bug does it fix, or wh
 
 ## Subcomponents involved:
 - [ ] apply_incr.fd (NOAA-PSL/land-apply_jedi_incr)
-- [ ] ufsLand.fd (NOAA-EPIC/ufs-land-driver-emc-dev)
 - [ ] ufs_model.fd (ufs-community/ufs-weather-model)
-- [ ] vector2tile_converter.fd (NOAA-PSL/land-vector2tile)
 - [ ] none
 
 ## Linked PR's and Issues:
@@ -27,7 +25,6 @@ EXAMPLE: Closes ufs-community/land-DA/issues/<issue_number>
     - [ ] Hera
     - [ ] Orion
     - [ ] Hercules
-    - [ ] Derecho
 - CI
   - [ ] Completed
 - PW-Clouds

diff --git a/.gitmodules b/.gitmodules
@@ -1,11 +1,3 @@
-[submodule "sorc/ufsLand.fd"]
-	path = sorc/ufsLand.fd
-	url = https://github.com/NOAA-EPIC/ufs-land-driver-emc-dev.git
-	ignore = dirty
-[submodule "sorc/vector2tile_converter.fd"]
-	path = sorc/vector2tile_converter.fd
-	url = https://github.com/NOAA-PSL/land-vector2tile.git
-	ignore = dirty
 [submodule "sorc/ufs_model.fd"]
 	path = sorc/ufs_model.fd
 	url = https://github.com/ufs-community/ufs-weather-model.git

diff --git a/parm/land_analysis_hera.yaml b/parm/land_analysis_hera.yaml
@@ -13,11 +13,10 @@ workflow:
     MACHINE: "hera"
     SCHED: "slurm"
     ACCOUNT: "epic"
-    EXP_NAME: "LETKF"
     EXP_BASEDIR: "/scratch2/NAGAPE/epic/{USER}/landda_test"
     JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/jedi_v7"
     WARMSTART_DIR: "/scratch2/NAGAPE/epic/UFS_Land-DA_Dev/inputs/DATA_RESTART"
-    FORCING: "gswp3"   # "gswp3" or "era5"
+    ATMOS_FORC: "gswp3"
     RES: "96"
     FCSTHR: "24"
     NPROCS_ANALYSIS: "6"
@@ -37,9 +36,8 @@ workflow:
     COMROOT: "&PTMP;/&envir;/com"
     DATAROOT: "&PTMP;/&envir;/tmp"
     KEEPDATA: "YES"
-    LOGDIR: "&COMROOT;/output/logs/run_&FORCING;"
+    LOGDIR: "&COMROOT;/output/logs"
     LOGFN_SUFFIX: "<cyclestr>_@Y@m@d@H.log</cyclestr>"
-    PATHRT: "&EXP_BASEDIR;"
     PDY:  "<cyclestr>@Y@m@d</cyclestr>"
     cyc: "<cyclestr>@H</cyclestr>"
     DATADEP_FILE1: "<cyclestr>&WARMSTART_DIR;/ufs_land_restart.@Y-@m-@d_@H-00-00.tile1.nc</cyclestr>"
@@ -59,8 +57,7 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
+        ATMOS_FORC: "&ATMOS_FORC;"
         model_ver: "&model_ver;"
         HOMElandda: "&HOMElandda;"
         COMROOT: "&COMROOT;"
@@ -83,8 +80,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
@@ -130,8 +125,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         model_ver: "&model_ver;"
@@ -164,8 +157,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         model_ver: "&model_ver;"
@@ -196,7 +187,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
         model_ver: "&model_ver;"
         RUN: "&RUN;"
         HOMElandda: "&HOMElandda;"
@@ -225,8 +215,7 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
+        ATMOS_FORC: "&ATMOS_FORC;"
         RES: "&RES;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
         model_ver: "&model_ver;"

diff --git a/parm/land_analysis_orion.yaml b/parm/land_analysis_orion.yaml
@@ -13,11 +13,10 @@ workflow:
     MACHINE: "orion"
     SCHED: "slurm"
     ACCOUNT: "epic"
-    EXP_NAME: "LETKF"
     EXP_BASEDIR: "/work/noaa/epic/{USER}/landda_test"
     JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA_Dev/jedi_v7_stack1.6"
     WARMSTART_DIR: "/work/noaa/epic/UFS_Land-DA_Dev/inputs/DATA_RESTART"
-    FORCING: "gswp3"   # "gswp3" or "era5"
+    ATMOS_FORC: "gswp3"
     RES: "96"
     FCSTHR: "24"
     NPROCS_ANALYSIS: "6"
@@ -37,9 +36,8 @@ workflow:
     COMROOT: "&PTMP;/&envir;/com"
     DATAROOT: "&PTMP;/&envir;/tmp"
     KEEPDATA: "YES"
-    LOGDIR: "&COMROOT;/output/logs/run_&FORCING;"
+    LOGDIR: "&COMROOT;/output/logs"
     LOGFN_SUFFIX: "<cyclestr>_@Y@m@d@H.log</cyclestr>"
-    PATHRT: "&EXP_BASEDIR;"
     PDY:  "<cyclestr>@Y@m@d</cyclestr>"
     cyc: "<cyclestr>@H</cyclestr>"
     DATADEP_FILE1: "<cyclestr>&WARMSTART_DIR;/ufs_land_restart.@Y-@m-@d_@H-00-00.tile1.nc</cyclestr>"
@@ -59,8 +57,7 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
+        ATMOS_FORC: "&ATMOS_FORC;"
         model_ver: "&model_ver;"
         HOMElandda: "&HOMElandda;"
         COMROOT: "&COMROOT;"
@@ -83,8 +80,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
@@ -130,8 +125,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         model_ver: "&model_ver;"
@@ -164,8 +157,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
         RES: "&RES;"
         TSTUB: "&TSTUB;"
         model_ver: "&model_ver;"
@@ -196,7 +187,6 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
         model_ver: "&model_ver;"
         RUN: "&RUN;"
         HOMElandda: "&HOMElandda;"
@@ -225,8 +215,7 @@ workflow:
         MACHINE: "&MACHINE;"
         SCHED: "&SCHED;"
         ACCOUNT: "&ACCOUNT;"
-        EXP_NAME: "&EXP_NAME;"
-        ATMOS_FORC: "&FORCING;"
+        ATMOS_FORC: "&ATMOS_FORC;"
         RES: "&RES;"
         WARMSTART_DIR: "&WARMSTART_DIR;"
         model_ver: "&model_ver;"

diff --git a/parm/run_without_rocoto.sh b/parm/run_without_rocoto.sh
diff --git a/parm/templates/template.tile2vector b/parm/templates/template.tile2vector