Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove land driver and vector2tile #129

Merged
merged 15 commits into from
Jul 31, 2024
Merged

Remove land driver and vector2tile #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
98b7aae
remove ufsLand and vector2tile
chan-hoo Jul 24, 2024
9c9d18d
update ctest
chan-hoo Jul 24, 2024
d20d7b7
update cmakelists
chan-hoo Jul 24, 2024
a5c3d56
update ex-scripts
chan-hoo Jul 24, 2024
4a88d25
remove forcing parm
chan-hoo Jul 24, 2024
6bc746e
remove exp_name
chan-hoo Jul 24, 2024
31d4709
remove unnecessary templates
chan-hoo Jul 24, 2024
daf5bf5
remove scheduler
chan-hoo Jul 25, 2024
e90f682
remove pathrt from parm yaml
chan-hoo Jul 25, 2024
bd5fc57
revive scheduler
chan-hoo Jul 26, 2024
3e12ed0
change ctest list
chan-hoo Jul 26, 2024
9b5c167
update ctest script
chan-hoo Jul 28, 2024
7d38f58
fix ctest jedi_incr script
chan-hoo Jul 28, 2024
0d9be55
update pr template
chan-hoo Jul 28, 2024
3985d1b
clean up comments
chan-hoo Jul 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .github/pull_request_template.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -27,7 +25,6 @@ EXAMPLE: Closes ufs-community/land-DA/issues/<issue_number>
- [ ] Hera
- [ ] Orion
- [ ] Hercules
- [ ] Derecho
- CI
- [ ] Completed
- PW-Clouds
Expand Down
8 changes: 0 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
19 changes: 4 additions & 15 deletions parm/land_analysis_hera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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@[email protected]</cyclestr>"
PATHRT: "&EXP_BASEDIR;"
PDY: "<cyclestr>@Y@m@d</cyclestr>"
cyc: "<cyclestr>@H</cyclestr>"
DATADEP_FILE1: "<cyclestr>&WARMSTART_DIR;/ufs_land_restart.@Y-@m-@[email protected]</cyclestr>"
Expand All @@ -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;"
Expand All @@ -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;"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -196,7 +187,6 @@ workflow:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
ACCOUNT: "&ACCOUNT;"
EXP_NAME: "&EXP_NAME;"
model_ver: "&model_ver;"
RUN: "&RUN;"
HOMElandda: "&HOMElandda;"
Expand Down Expand Up @@ -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;"
Expand Down
19 changes: 4 additions & 15 deletions parm/land_analysis_orion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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@[email protected]</cyclestr>"
PATHRT: "&EXP_BASEDIR;"
PDY: "<cyclestr>@Y@m@d</cyclestr>"
cyc: "<cyclestr>@H</cyclestr>"
DATADEP_FILE1: "<cyclestr>&WARMSTART_DIR;/ufs_land_restart.@Y-@m-@[email protected]</cyclestr>"
Expand All @@ -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;"
Expand All @@ -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;"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -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;"
Expand Down Expand Up @@ -196,7 +187,6 @@ workflow:
MACHINE: "&MACHINE;"
SCHED: "&SCHED;"
ACCOUNT: "&ACCOUNT;"
EXP_NAME: "&EXP_NAME;"
model_ver: "&model_ver;"
RUN: "&RUN;"
HOMElandda: "&HOMElandda;"
Expand Down Expand Up @@ -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;"
Expand Down
116 changes: 0 additions & 116 deletions parm/run_without_rocoto.sh
View file
Open in desktop

This file was deleted.

52 changes: 0 additions & 52 deletions parm/templates/template.tile2vector
View file
Open in desktop

This file was deleted.

Loading
Loading