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

Change structure of output and log directories #75

Merged
merged 7 commits into from
Mar 13, 2024
Merged

Change structure of output and log directories #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8a28324
change structrue of output dir
chan-hoo Mar 7, 2024
5e15fb9
move slurm log file to LOGDIR
chan-hoo Mar 7, 2024
507cb8a
additional change for com structure
chan-hoo Mar 7, 2024
6c07243
remove lmod-setup
chan-hoo Mar 12, 2024
223d127
Update Jenkinsfile accounts
zach1221 Mar 12, 2024
63c6b4e
Update Jenkinsfile: hera build option
jkbk2004 Mar 13, 2024
eff4c7c
Update Jenkinsfile: orion build option
jkbk2004 Mar 13, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ parm/*.db
parm/*.out
parm/*.err
parm/*.log
parm/land_analysis.yaml

__pycache__
*.swp
Expand Down
17 changes: 12 additions & 5 deletions parm/land_analysis_era5_hera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ workflow:
MACHINE: "hera"
ACCOUNT: "nems"
EXP_NAME: "LETKF"
EXP_BASEDIR: "/scratch2/NCEPDEV/fv3-cam/Chan-hoo.Jeon/landda_version"
NET: "landda"
model_ver: "v1.2.1"
EXP_BASEDIR: "/scratch2/NAGAPE/epic/{USER}/landda_test"
JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA/jedi"
LANDDA_INPUTS: "/scratch2/NAGAPE/epic/UFS_Land-DA/inputs"
FORCING: "era5"
Expand All @@ -23,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;/landda_expts/DA_era5_test"
LOG: "&EXP_BASEDIR;/tests"
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:
Expand All @@ -55,6 +57,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_exp.log"
task_prepobs:
envars:
OBS_TYPES: "&OBS_TYPES;"
Expand All @@ -75,6 +78,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_obs.log"
dependency:
taskdep:
attrs:
Expand All @@ -101,6 +105,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_bmat.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -133,6 +138,7 @@ workflow:
nodes: "1:ppn=&NPROCS_ANA;"
walltime: 00:15:00
queue: batch
join: "&LOGDIR;/run_ana.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -165,6 +171,7 @@ workflow:
nodes: "1:ppn=&NPROCS_FCST;"
walltime: 00:30:00
queue: batch
join: "&LOGDIR;/run_fcst.log"
dependency:
taskdep:
attrs:
Expand Down
17 changes: 12 additions & 5 deletions parm/land_analysis_era5_orion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ workflow:
MACHINE: "orion"
ACCOUNT: "epic"
EXP_NAME: "LETKF"
EXP_BASEDIR: "/work/noaa/epic/chjeon/landda_version"
NET: "landda"
model_ver: "v1.2.1"
EXP_BASEDIR: "/work/noaa/epic/{USER}/landda_test"
JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA/jedi"
LANDDA_INPUTS: "/work/noaa/epic/UFS_Land-DA/inputs"
FORCING: "era5"
Expand All @@ -23,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;/landda_expts/DA_era5_test"
LOG: "&EXP_BASEDIR;/tests"
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:
Expand All @@ -55,6 +57,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_exp.log"
task_prepobs:
envars:
OBS_TYPES: "&OBS_TYPES;"
Expand All @@ -75,6 +78,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_obs.log"
dependency:
taskdep:
attrs:
Expand All @@ -101,6 +105,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_bmat.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -133,6 +138,7 @@ workflow:
nodes: "1:ppn=&NPROCS_ANA;"
walltime: 00:15:00
queue: batch
join: "&LOGDIR;/run_ana.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -165,6 +171,7 @@ workflow:
nodes: "1:ppn=&NPROCS_FCST;"
walltime: 00:30:00
queue: batch
join: "&LOGDIR;/run_fcst.log"
dependency:
taskdep:
attrs:
Expand Down
17 changes: 12 additions & 5 deletions parm/land_analysis_gswp3_hera.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ workflow:
MACHINE: "hera"
ACCOUNT: "epic"
EXP_NAME: "LETKF"
EXP_BASEDIR: "/scratch2/NAGAPE/epic/Chan-hoo.Jeon/landda_gswp3"
NET: "landda"
model_ver: "v1.2.1"
EXP_BASEDIR: "/scratch2/NAGAPE/epic/{USER}/landda_test"
JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA/jedi"
LANDDA_INPUTS: "/scratch2/NAGAPE/epic/UFS_Land-DA/inputs"
FORCING: "gswp3"
Expand All @@ -23,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;/landda_expts/DA_gswp3_test"
LOG: "&EXP_BASEDIR;/tests"
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:
Expand All @@ -55,6 +57,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_exp.log"
task_prepobs:
envars:
OBS_TYPES: "&OBS_TYPES;"
Expand All @@ -75,6 +78,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_obs.log"
dependency:
taskdep:
attrs:
Expand All @@ -101,6 +105,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_bmat.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -133,6 +138,7 @@ workflow:
nodes: "1:ppn=&NPROCS_ANA;"
walltime: 00:15:00
queue: batch
join: "&LOGDIR;/run_ana.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -165,6 +171,7 @@ workflow:
nodes: "1:ppn=&NPROCS_FCST;"
walltime: 00:30:00
queue: batch
join: "&LOGDIR;/run_fcst.log"
dependency:
taskdep:
attrs:
Expand Down
17 changes: 12 additions & 5 deletions parm/land_analysis_gswp3_orion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ workflow:
MACHINE: "orion"
ACCOUNT: "epic"
EXP_NAME: "LETKF"
EXP_BASEDIR: "/work/noaa/epic/chjeon/landda_fixjjob"
NET: "landda"
model_ver: "v1.2.1"
EXP_BASEDIR: "/work/noaa/epic/{USER}/landda_test"
JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA/jedi"
LANDDA_INPUTS: "/work/noaa/epic/UFS_Land-DA/inputs"
FORCING: "gswp3"
Expand All @@ -23,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;/landda_expts/DA_gswp3_test"
LOG: "&EXP_BASEDIR;/tests"
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:
Expand All @@ -55,6 +57,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_exp.log"
task_prepobs:
envars:
OBS_TYPES: "&OBS_TYPES;"
Expand All @@ -75,6 +78,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_obs.log"
dependency:
taskdep:
attrs:
Expand All @@ -101,6 +105,7 @@ workflow:
cores: 1
walltime: 00:02:00
queue: batch
join: "&LOGDIR;/prep_bmat.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -133,6 +138,7 @@ workflow:
nodes: "1:ppn=&NPROCS_ANA;"
walltime: 00:15:00
queue: batch
join: "&LOGDIR;/run_ana.log"
dependency:
taskdep:
attrs:
Expand Down Expand Up @@ -165,6 +171,7 @@ workflow:
nodes: "1:ppn=&NPROCS_FCST;"
walltime: 00:45:00
queue: batch
join: "&LOGDIR;/run_fcst.log"
dependency:
taskdep:
attrs:
Expand Down
31 changes: 0 additions & 31 deletions parm/lmod-setup.sh
View file
Open in desktop

This file was deleted.

20 changes: 11 additions & 9 deletions parm/run_without_rocoto.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
#SBATCH --job-name=land_da_wflow
#SBATCH --account=nems
#SBATCH --account=epic
#SBATCH --qos=debug
#SBATCH --nodes=1
#SBATCH --tasks-per-node=6
Expand All @@ -10,16 +10,18 @@
#SBATCH -e err_landda_wflow.%j.err


export MACHINE="hera"
export ACCOUNT="nems"
export FORCING="gswp3"
export MACHINE="orion"
export ACCOUNT="epic"
export FORCING="era5"
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_test"
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_test"
export JEDI_INSTALL="/work/noaa/epic/UFS_Land-DA/jedi"
export LANDDA_INPUTS="/work/noaa/epic/UFS_Land-DA/inputs"
fi
Expand All @@ -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}"
Expand Down
3 changes: 1 addition & 2 deletions sorc/app_build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,8 +343,7 @@ if [ "${VERBOSE}" = true ]; then
MAKE_SETTINGS="${MAKE_SETTINGS} VERBOSE=1"
fi

# Before we go on load modules, we first need to activate Lmod for some systems
source ${HOME_DIR}/parm/lmod-setup.sh ${PLATFORM}
module purge

# source version file for build
BUILD_VERSION_FILE="${HOME_DIR}/versions/build.ver_${PLATFORM}"
Expand Down
Loading
Loading