From 4439b7551a9792dbba390c04c7d8e2ee20ab1731 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Thu, 29 Feb 2024 11:58:32 -0500 Subject: [PATCH 01/10] Update Jenkinsfile for s3 archiving --- sorc/test/ci/Jenkinsfile | 46 ++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 16 deletions(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index c54f1907..926b147b 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('Launch SonarQube') { steps { script { - build job: '/land-da/land-da-sonarqube', parameters: [ + build job: '/land-DA_workflow/land-da-sonarqube', parameters: [ string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop'), string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: '') ], wait: false @@ -68,12 +68,16 @@ pipeline { cleanWs() checkout scm 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 - 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/ - cd sorc/build/ + module use modulefiles && module load landda_hera.intel + mkdir build + cp test/hera_ctest.sh build/ + cp test/check_ctest.sh build/ + cp test/run_hera_ctest.sh build/ + cd build/ + module use ../modulefiles && module load landda_hera.intel + ecbuild ../ && make -j4 echo $(pwd) ./run_hera_ctest.sh ''' @@ -92,18 +96,28 @@ pipeline { cleanWs() checkout scm 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 - 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/ + module use modulefiles && module load landda_orion.intel.lua + mkdir build + cp test/orion_ctest.sh build/ + cp test/check_ctest.sh build/ + cp test/run_orion_ctest.sh build/ + cd test/ sed -i 's|MACHINE_ID=${MACHINE_ID:-hera}|MACHINE_ID=${MACHINE_ID:-orion}|g' run_ufs_datm_lnd.sh - cd ../../ - cd sorc/build/ + cd .. + cd build/ + module use ../modulefiles && module load landda_orion.intel.lua + ecbuild ../ && make -j4 echo $(pwd) ctest + export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }') + + + tar --create --gzip --verbose --dereference --file "${machine_name_logs}.tgz" ${WORKSPACE}/tests/logs/*.log + ''' + s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: [] } } stage('Run Land DA Workflow on Hercules') { @@ -138,7 +152,7 @@ pipeline { sh ''' ''' - } - } - } + } + } + } } From 273f6f335b8ecbc84db9a23f301d36718980d1cc Mon Sep 17 00:00:00 2001 From: ankimball <131040494+ankimball@users.noreply.github.com> Date: Mon, 4 Mar 2024 06:33:34 -0600 Subject: [PATCH 02/10] Update Jenkinsfile --- sorc/test/ci/Jenkinsfile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index 926b147b..56be7200 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -111,13 +111,14 @@ pipeline { ecbuild ../ && make -j4 echo $(pwd) ctest - export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }') + ''' + // export machine_name_logs=$(echo $machine | awk '{ print tolower($1) }') - tar --create --gzip --verbose --dereference --file "${machine_name_logs}.tgz" ${WORKSPACE}/tests/logs/*.log + // tar --create --gzip --verbose --dereference --file "${machine_name_logs}.tgz" ${WORKSPACE}/tests/logs/*.log - ''' - s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: [] + // ''' + // s3Upload consoleLogLevel: 'INFO', dontSetBuildResultOnFailure: false, dontWaitForConcurrentBuildCompletion: false, entries: [[bucket: 'noaa-epic-prod-jenkins-artifacts', excludedFile: '', flatten: true, gzipFiles: false, keepForever: false, managedArtifacts: true, noUploadOnFailure: false, selectedRegion: 'us-east-1', showDirectlyInBrowser: false, sourceFile: "**/*tgz*", storageClass: 'STANDARD', uploadFromSlave: false, useServerSideEncryption: false]], pluginFailureResultConstraint: 'FAILURE', profileName: 'main', userMetadata: [] } } stage('Run Land DA Workflow on Hercules') { From 440f36fd6f1ca4ebff160b763347bc28c66f7d06 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:16:20 -0500 Subject: [PATCH 03/10] Update Jenkinsfile --- sorc/test/ci/Jenkinsfile | 32 ++++++++++++-------------------- 1 file changed, 12 insertions(+), 20 deletions(-) diff --git a/sorc/test/ci/Jenkinsfile b/sorc/test/ci/Jenkinsfile index 56be7200..19b6ab2f 100644 --- a/sorc/test/ci/Jenkinsfile +++ b/sorc/test/ci/Jenkinsfile @@ -68,16 +68,12 @@ pipeline { cleanWs() checkout scm sh ''' - git submodule update --init --recursive ln -fs /scratch2/NAGAPE/epic/UFS_Land-DA/inputs /scratch2/NAGAPE/epic/role.epic/jenkins/workspace/ - module use modulefiles && module load landda_hera.intel - mkdir build - cp test/hera_ctest.sh build/ - cp test/check_ctest.sh build/ - cp test/run_hera_ctest.sh build/ - cd build/ - module use ../modulefiles && module load landda_hera.intel - ecbuild ../ && make -j4 + sh sorc/app_build.sh + 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/ + cd sorc/build/ echo $(pwd) ./run_hera_ctest.sh ''' @@ -96,19 +92,15 @@ pipeline { cleanWs() checkout scm sh ''' - git submodule update --init --recursive ln -fs /work/noaa/epic/UFS_Land-DA/inputs /work/noaa/epic/role-epic/jenkins/workspace/ - module use modulefiles && module load landda_orion.intel.lua - mkdir build - cp test/orion_ctest.sh build/ - cp test/check_ctest.sh build/ - cp test/run_orion_ctest.sh build/ - cd test/ + sh sorc/app_build.sh + 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 build/ - module use ../modulefiles && module load landda_orion.intel.lua - ecbuild ../ && make -j4 + cd ../../ + cd sorc/build/ echo $(pwd) ctest ''' From a1f0b8169dd33360cb19d0a82fc99b8c1c4b8e65 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:50:25 -0500 Subject: [PATCH 04/10] Update JLANDDA_RUN_FCST sync with develop --- jobs/JLANDDA_RUN_FCST | 1 + 1 file changed, 1 insertion(+) diff --git a/jobs/JLANDDA_RUN_FCST b/jobs/JLANDDA_RUN_FCST index d769becc..f71e2149 100755 --- a/jobs/JLANDDA_RUN_FCST +++ b/jobs/JLANDDA_RUN_FCST @@ -111,6 +111,7 @@ if [[ $do_jedi == "YES" && ${ATMOS_FORC} == "gswp3" ]]; then fi # save analysis restart + mkdir -p ${MEM_MODL_OUTDIR}/restarts/tile for tile in 1 2 3 4 5 6 do cp ${MEM_WORKDIR}/ufs_land_restart.${YYYY}-${MM}-${DD}_${HH}-00-00.tile${tile}.nc ${MEM_MODL_OUTDIR}/restarts/tile/ufs_land_restart_anal.${YYYY}-${MM}-${DD}_${HH}-00-00.tile${tile}.nc From ba61e5228e3b4c9ebfe042ee2e46c697b2bba023 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:53:56 -0500 Subject: [PATCH 05/10] Update JLANDDA_RUN_FCST --- jobs/JLANDDA_RUN_FCST | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/JLANDDA_RUN_FCST b/jobs/JLANDDA_RUN_FCST index f71e2149..0e1b8441 100755 --- a/jobs/JLANDDA_RUN_FCST +++ b/jobs/JLANDDA_RUN_FCST @@ -255,8 +255,8 @@ if [[ ${ATMOS_FORC} == "era5" ]]; then fi if [[ ${ATMOS_FORC} == "gswp3" ]]; then - for tile in 1 2 3 4 5 6 - do - cp ${MEM_WORKDIR}/noahmp_output/${TEST_NAME_RST}/ufs.cpld.lnd.out.${nYYYY}-${nMM}-${nDD}-00000.tile${tile}.nc ${MEM_MODL_OUTDIR}/restarts/tile/ufs_land_restart_back.${nYYYY}-${nMM}-${nDD}_${nHH}-00-00.tile${tile}.nc - done + for tile in 1 2 3 4 5 6 + do + cp ${OUTDIR}/${mem_ens}/noahmp/${TEST_NAME_RST}/ufs.cpld.lnd.out.${nYYYY}-${nMM}-${nDD}-00000.tile${tile}.nc ${MEM_MODL_OUTDIR}/restarts/tile/ufs_land_restart_back.${nYYYY}-${nMM}-${nDD}_${nHH}-00-00.tile${tile}.nc + done fi From 10beaa13a153be30dda97f7da821e23190f3a167 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:57:08 -0500 Subject: [PATCH 06/10] Update and rename land_analysis.yaml to land_analysis_era5_hera.yaml --- parm/{land_analysis.yaml => land_analysis_era5_hera.yaml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename parm/{land_analysis.yaml => land_analysis_era5_hera.yaml} (96%) diff --git a/parm/land_analysis.yaml b/parm/land_analysis_era5_hera.yaml similarity index 96% rename from parm/land_analysis.yaml rename to parm/land_analysis_era5_hera.yaml index 6bbd557d..5ae85522 100644 --- a/parm/land_analysis.yaml +++ b/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 From 8d55b3df1115f8922fc0ff46ef2bb5cdacc0a795 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:58:50 -0500 Subject: [PATCH 07/10] Create land_analysis_era5_orion.yaml --- parm/land_analysis_era5_orion.yaml | 171 +++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 parm/land_analysis_era5_orion.yaml diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml new file mode 100644 index 00000000..a12e61c4 --- /dev/null +++ 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: "@Y@m@d@H" + PTIME: "@Y@m@d@H" + NTIME: "@Y@m@d@H" + 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 From ec5ffde66899ac814b7a8d7a3bcc777d84e5614a Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 12:59:44 -0500 Subject: [PATCH 08/10] Create land_analysis_gswp3_hera.yaml --- parm/land_analysis_gswp3_hera.yaml | 171 +++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 parm/land_analysis_gswp3_hera.yaml diff --git a/parm/land_analysis_gswp3_hera.yaml b/parm/land_analysis_gswp3_hera.yaml new file mode 100644 index 00000000..4817d667 --- /dev/null +++ b/parm/land_analysis_gswp3_hera.yaml @@ -0,0 +1,171 @@ +workflow: + attrs: + realtime: false + scheduler: slurm + cycledef: + - attrs: + group: epic + spec: 200001030000 200001030000 24:00:00 + entities: + MACHINE: "hera" + ACCOUNT: "epic" + EXP_NAME: "LETKF" + EXP_BASEDIR: "/scratch2/NAGAPE/epic/Chan-hoo.Jeon/landda_gswp3" + JEDI_INSTALL: "/scratch2/NAGAPE/epic/UFS_Land-DA/jedi" + LANDDA_INPUTS: "/scratch2/NAGAPE/epic/UFS_Land-DA/inputs" + FORCING: "gswp3" + 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_gswp3_test" + LOG: "&EXP_BASEDIR;/tests" + PATHRT: "&EXP_BASEDIR;" + CTIME: "@Y@m@d@H" + PTIME: "@Y@m@d@H" + NTIME: "@Y@m@d@H" + 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 From 0b7a42ae4f279bbbbe2eea155ddaea71ca533f60 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 13:00:36 -0500 Subject: [PATCH 09/10] Create land_analysis_gswp3_orion.yaml --- parm/land_analysis_gswp3_orion.yaml | 171 ++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 parm/land_analysis_gswp3_orion.yaml diff --git a/parm/land_analysis_gswp3_orion.yaml b/parm/land_analysis_gswp3_orion.yaml new file mode 100644 index 00000000..7e32ccf4 --- /dev/null +++ b/parm/land_analysis_gswp3_orion.yaml @@ -0,0 +1,171 @@ +workflow: + attrs: + realtime: false + scheduler: slurm + cycledef: + - attrs: + group: epic + spec: 200001030000 200001030000 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: "gswp3" + 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_gswp3_test" + LOG: "&EXP_BASEDIR;/tests" + PATHRT: "&EXP_BASEDIR;" + CTIME: "@Y@m@d@H" + PTIME: "@Y@m@d@H" + NTIME: "@Y@m@d@H" + 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:45:00 + queue: batch + dependency: + taskdep: + attrs: + task: runana From 2d5b2d121a62fb6d951425e052515e4d763145d4 Mon Sep 17 00:00:00 2001 From: zach1221 <99902696+zach1221@users.noreply.github.com> Date: Mon, 4 Mar 2024 13:01:50 -0500 Subject: [PATCH 10/10] Update land_analysis_test.xml sync with develop --- parm/land_analysis_test.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parm/land_analysis_test.xml b/parm/land_analysis_test.xml index 356e72ab..3bf6d006 100644 --- a/parm/land_analysis_test.xml +++ b/parm/land_analysis_test.xml @@ -208,7 +208,7 @@ 1:ppn=&NPROCS_ANA; batch 00:15:00 - &CYCLEDIR;/jobs/JLANDDA_PREP_OBS + &CYCLEDIR;/jobs/JLANDDA_RUN_ANA runana OBS_TYPES