From 8a2832485ff6653ad5fb8da72a0cb08bcf200381 Mon Sep 17 00:00:00 2001 From: "Chan-hoo.Jeon" Date: Thu, 7 Mar 2024 15:33:02 +0000 Subject: [PATCH 1/7] change structrue of output dir --- .gitignore | 1 + parm/land_analysis_era5_hera.yaml | 8 +++++--- parm/land_analysis_era5_orion.yaml | 8 +++++--- parm/land_analysis_gswp3_hera.yaml | 8 +++++--- parm/land_analysis_gswp3_orion.yaml | 8 +++++--- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index e11ea82b..718c857b 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,7 @@ parm/*.db parm/*.out parm/*.err parm/*.log +parm/land_analysis.yaml __pycache__ *.swp diff --git a/parm/land_analysis_era5_hera.yaml b/parm/land_analysis_era5_hera.yaml index d23c7e7e..bb7d915a 100644 --- a/parm/land_analysis_era5_hera.yaml +++ b/parm/land_analysis_era5_hera.yaml @@ -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" @@ -26,8 +28,8 @@ workflow: 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" + OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;" + LOG: "&EXP_BASEDIR;/comout/output/logs" PATHRT: "&EXP_BASEDIR;" CTIME: "@Y@m@d@H" PTIME: "@Y@m@d@H" diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml index ce93b273..2a59eae1 100644 --- a/parm/land_analysis_era5_orion.yaml +++ b/parm/land_analysis_era5_orion.yaml @@ -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" @@ -26,8 +28,8 @@ workflow: 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" + OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;" + LOG: "&EXP_BASEDIR;/comout/output/logs" PATHRT: "&EXP_BASEDIR;" CTIME: "@Y@m@d@H" PTIME: "@Y@m@d@H" diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml index 4817d667..9e533b69 100644 --- a/parm/land_analysis_gswp3_hera.yaml +++ b/parm/land_analysis_gswp3_hera.yaml @@ -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" @@ -26,8 +28,8 @@ workflow: WORKDIR: "&EXP_BASEDIR;/workdir" CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow" EXECdir: "&CYCLEDIR;/exec" - OUTDIR: "&EXP_BASEDIR;/landda_expts/DA_gswp3_test" - LOG: "&EXP_BASEDIR;/tests" + OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;" + LOG: "&EXP_BASEDIR;/comout/output/logs" PATHRT: "&EXP_BASEDIR;" CTIME: "@Y@m@d@H" PTIME: "@Y@m@d@H" diff --git a/parm/land_analysis_gswp3_orion.yaml b/parm/land_analysis_gswp3_orion.yaml index 7e32ccf4..f2566528 100644 --- a/parm/land_analysis_gswp3_orion.yaml +++ b/parm/land_analysis_gswp3_orion.yaml @@ -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" @@ -26,8 +28,8 @@ workflow: WORKDIR: "&EXP_BASEDIR;/workdir" CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow" EXECdir: "&CYCLEDIR;/exec" - OUTDIR: "&EXP_BASEDIR;/landda_expts/DA_gswp3_test" - LOG: "&EXP_BASEDIR;/tests" + OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;" + LOG: "&EXP_BASEDIR;/comout/output/logs" PATHRT: "&EXP_BASEDIR;" CTIME: "@Y@m@d@H" PTIME: "@Y@m@d@H" From 5e15fb9fc49c8c685ed9bd901879b723b8b7f8eb Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Thu, 7 Mar 2024 11:11:44 -0600 Subject: [PATCH 2/7] move slurm log file to LOGDIR --- parm/land_analysis_era5_hera.yaml | 5 +++++ parm/land_analysis_era5_orion.yaml | 9 +++++++-- parm/land_analysis_gswp3_hera.yaml | 5 +++++ parm/land_analysis_gswp3_orion.yaml | 5 +++++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/parm/land_analysis_era5_hera.yaml b/parm/land_analysis_era5_hera.yaml index bb7d915a..ba1dad10 100644 --- a/parm/land_analysis_era5_hera.yaml +++ b/parm/land_analysis_era5_hera.yaml @@ -57,6 +57,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_exp.log" task_prepobs: envars: OBS_TYPES: "&OBS_TYPES;" @@ -77,6 +78,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_obs.log" dependency: taskdep: attrs: @@ -103,6 +105,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_bmat.log" dependency: taskdep: attrs: @@ -135,6 +138,7 @@ workflow: nodes: "1:ppn=&NPROCS_ANA;" walltime: 00:15:00 queue: batch + join: "&LOGDIR;/run_ana.log" dependency: taskdep: attrs: @@ -167,6 +171,7 @@ workflow: nodes: "1:ppn=&NPROCS_FCST;" walltime: 00:30:00 queue: batch + join: "&LOGDIR;/run_fcst.log" dependency: taskdep: attrs: diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml index 2a59eae1..7af7083d 100644 --- a/parm/land_analysis_era5_orion.yaml +++ b/parm/land_analysis_era5_orion.yaml @@ -29,12 +29,12 @@ workflow: CYCLEDIR: "&EXP_BASEDIR;/land-DA_workflow" EXECdir: "&CYCLEDIR;/exec" OUTDIR: "&EXP_BASEDIR;/comout/&NET;/&model_ver;/run_&FORCING;" - LOG: "&EXP_BASEDIR;/comout/output/logs" + LOGDIR: "&EXP_BASEDIR;/comout/output/logs" PATHRT: "&EXP_BASEDIR;" CTIME: "@Y@m@d@H" PTIME: "@Y@m@d@H" NTIME: "@Y@m@d@H" - log: "&LOG;/workflow.log" + log: "&LOGDIR;/workflow.log" tasks: task_prepexp: envars: @@ -57,6 +57,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_exp.log" task_prepobs: envars: OBS_TYPES: "&OBS_TYPES;" @@ -77,6 +78,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_obs.log" dependency: taskdep: attrs: @@ -103,6 +105,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_bmat.log" dependency: taskdep: attrs: @@ -135,6 +138,7 @@ workflow: nodes: "1:ppn=&NPROCS_ANA;" walltime: 00:15:00 queue: batch + join: "&LOGDIR;/run_ana.log" dependency: taskdep: attrs: @@ -167,6 +171,7 @@ workflow: nodes: "1:ppn=&NPROCS_FCST;" walltime: 00:30:00 queue: batch + join: "&LOGDIR;/run_fcst.log" dependency: taskdep: attrs: diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml index 9e533b69..4d75acbf 100644 --- a/parm/land_analysis_gswp3_hera.yaml +++ b/parm/land_analysis_gswp3_hera.yaml @@ -57,6 +57,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_exp.log" task_prepobs: envars: OBS_TYPES: "&OBS_TYPES;" @@ -77,6 +78,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_obs.log" dependency: taskdep: attrs: @@ -103,6 +105,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_bmat.log" dependency: taskdep: attrs: @@ -135,6 +138,7 @@ workflow: nodes: "1:ppn=&NPROCS_ANA;" walltime: 00:15:00 queue: batch + join: "&LOGDIR;/run_ana.log" dependency: taskdep: attrs: @@ -167,6 +171,7 @@ workflow: nodes: "1:ppn=&NPROCS_FCST;" walltime: 00:30:00 queue: batch + join: "&LOGDIR;/run_fcst.log" dependency: taskdep: attrs: diff --git a/parm/land_analysis_gswp3_orion.yaml b/parm/land_analysis_gswp3_orion.yaml index f2566528..62fc0252 100644 --- a/parm/land_analysis_gswp3_orion.yaml +++ b/parm/land_analysis_gswp3_orion.yaml @@ -57,6 +57,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_exp.log" task_prepobs: envars: OBS_TYPES: "&OBS_TYPES;" @@ -77,6 +78,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_obs.log" dependency: taskdep: attrs: @@ -103,6 +105,7 @@ workflow: cores: 1 walltime: 00:02:00 queue: batch + join: "&LOGDIR;/prep_bmat.log" dependency: taskdep: attrs: @@ -135,6 +138,7 @@ workflow: nodes: "1:ppn=&NPROCS_ANA;" walltime: 00:15:00 queue: batch + join: "&LOGDIR;/run_ana.log" dependency: taskdep: attrs: @@ -167,6 +171,7 @@ workflow: nodes: "1:ppn=&NPROCS_FCST;" walltime: 00:45:00 queue: batch + join: "&LOGDIR;/run_fcst.log" dependency: taskdep: attrs: From 507cb8a49a799021a08d3e6bcd233e6ecd090613 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Thu, 7 Mar 2024 12:37:02 -0600 Subject: [PATCH 3/7] additional change for com structure --- parm/land_analysis_era5_hera.yaml | 8 ++++---- parm/land_analysis_era5_orion.yaml | 6 +++--- parm/land_analysis_gswp3_hera.yaml | 8 ++++---- parm/land_analysis_gswp3_orion.yaml | 8 ++++---- parm/run_without_rocoto.sh | 12 +++++++----- 5 files changed, 22 insertions(+), 20 deletions(-) diff --git a/parm/land_analysis_era5_hera.yaml b/parm/land_analysis_era5_hera.yaml index ba1dad10..a5664795 100644 --- 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: "@Y@m@d@H" PTIME: "@Y@m@d@H" NTIME: "@Y@m@d@H" - 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 index 7af7083d..a676ed84 100644 --- 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: "@Y@m@d@H" PTIME: "@Y@m@d@H" diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml index 4d75acbf..d061a01f 100644 --- 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: "@Y@m@d@H" PTIME: "@Y@m@d@H" NTIME: "@Y@m@d@H" - 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 index 62fc0252..c06e091e 100644 --- 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: "@Y@m@d@H" PTIME: "@Y@m@d@H" NTIME: "@Y@m@d@H" - 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 index b589660e..2369c6a1 100644 --- 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}" From 6c07243b6e3bc64845c17a8dcf8012fcc0d411b2 Mon Sep 17 00:00:00 2001 From: Chan-Hoo Jeon Date: Tue, 12 Mar 2024 05:58:08 -0500 Subject: [PATCH 4/7] remove lmod-setup --- parm/lmod-setup.sh | 31 ------------------------------- parm/run_without_rocoto.sh | 12 ++++++------ sorc/app_build.sh | 3 +-- 3 files changed, 7 insertions(+), 39 deletions(-) delete mode 100755 parm/lmod-setup.sh diff --git a/parm/lmod-setup.sh b/parm/lmod-setup.sh deleted file mode 100755 index e04c4bbd..00000000 --- a/parm/lmod-setup.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -if [ $# = 0 ]; then - L_MACHINE=${MACHINE} - cat << EOF_USAGE -Usage: source lmod-setup.sh PLATFORM - -OPTIONS: - PLATFORM - name of machine you are building on - (e.g. hera | jet | orion | hercules | wcoss2 ) -EOF_USAGE - exit 1 -else - L_MACHINE=$1 -fi - -if [ "$L_MACHINE" != wcoss2 ]; then - [[ ${SHELLOPTS} =~ nounset ]] && has_mu=true || has_mu=false - [[ ${SHELLOPTS} =~ errexit ]] && has_me=true || has_me=false - $has_mu && set +u - $has_me && set +e - source /etc/profile - $has_mu && set -u - $has_me && set -e -fi - -if [ "$L_MACHINE" = wcoss2 ]; then - module reset -else - module purge -fi diff --git a/parm/run_without_rocoto.sh b/parm/run_without_rocoto.sh index 2369c6a1..4e8a3bb6 100644 --- a/parm/run_without_rocoto.sh +++ b/parm/run_without_rocoto.sh @@ -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 @@ -10,18 +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/NAGAPE/epic/{USER}/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/{USER}/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 diff --git a/sorc/app_build.sh b/sorc/app_build.sh index e726bd66..95666241 100755 --- a/sorc/app_build.sh +++ b/sorc/app_build.sh @@ -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}" From 223d127050fd1b4388c4ca7fdd07198e970618ab Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Tue, 12 Mar 2024 11:01:01 -0400 Subject: [PATCH 5/7] Update Jenkinsfile accounts --- sorc/test/ci/Jenkinsfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index a9370e8b..1d173bc4 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -60,7 +60,7 @@ pipeline { label "hera" } environment { - ACCNR = 'nems' + ACCNR = 'epic' NODE_PATH = '/scratch2/NAGAPE/epic/role.epic/' } steps { @@ -88,7 +88,7 @@ pipeline { label "orion" } environment { - ACCNR = 'nems' + ACCNR = 'epic' NODE_PATH = '/work/noaa/epic/role-epic/' } steps { @@ -102,9 +102,9 @@ pipeline { cp sorc/test/orion_ctest.sh sorc/build/ cp sorc/test/check_ctest.sh sorc/build/ cp sorc/test/run_orion_ctest.sh sorc/build/ - cd sorc/test/ - sed -i 's|MACHINE_ID=${MACHINE_ID:-hera}|MACHINE_ID=${MACHINE_ID:-orion}|g' run_ufs_datm_lnd.sh - cd ../../ + cd sorc/test/ + sed -i 's|MACHINE_ID=${MACHINE_ID:-hera}|MACHINE_ID=${MACHINE_ID:-orion}|g' run_ufs_datm_lnd.sh + cd ../../ cd sorc/build/ echo $(pwd) ctest From 63c6b4e263bb050e01c69899157c9cf4e8e181ac Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Wed, 13 Mar 2024 08:39:05 -0400 Subject: [PATCH 6/7] Update Jenkinsfile: hera build option --- sorc/test/ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index 1d173bc4..54e60322 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -70,7 +70,7 @@ pipeline { sh ''' git submodule update --init --recursive ln -fs /scratch2/NAGAPE/epic/UFS_Land-DA/inputs /scratch2/NAGAPE/epic/role.epic/jenkins/workspace/ - sh sorc/app_build.sh + sh sorc/app_build.sh -c=intel --conda=off --build cp sorc/test/hera_ctest.sh sorc/build/ cp sorc/test/check_ctest.sh sorc/build/ cp sorc/test/run_hera_ctest.sh sorc/build/ From eff4c7cb1300cd8bd1f487a7f26a8261c4ce941f Mon Sep 17 00:00:00 2001 From: JONG KIM Date: Wed, 13 Mar 2024 10:27:19 -0400 Subject: [PATCH 7/7] Update Jenkinsfile: orion build option --- sorc/test/ci/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index 54e60322..43d57a4b 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -98,7 +98,7 @@ pipeline { sh ''' git submodule update --init --recursive ln -fs /work/noaa/epic/UFS_Land-DA/inputs /work/noaa/epic/role-epic/jenkins/workspace/ - sh sorc/app_build.sh + sh sorc/app_build.sh -c=intel --conda=off --build cp sorc/test/orion_ctest.sh sorc/build/ cp sorc/test/check_ctest.sh sorc/build/ cp sorc/test/run_orion_ctest.sh sorc/build/