Merge branch 'develop' into text/us-134

ufs-community · Mar 7, 2024 · cdda677 · cdda677
2 parents 22abec9 + 2e382e1
commit cdda677
Show file tree

Hide file tree

Showing 24 changed files with 212 additions and 226 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,7 @@ parm/*.xml
 parm/*.db
 parm/*.out
 parm/*.err
+parm/*.log
 
 __pycache__
 *.swp

diff --git a/check_gdas_outputs.sh b/check_gdas_outputs.sh
diff --git a/check_test.sh b/check_test.sh
diff --git a/configures/machine.hera.intel b/configures/machine.hera.intel
diff --git a/configures/machine.orion.intel b/configures/machine.orion.intel
diff --git a/do_submit_test.sh b/do_submit_test.sh
diff --git a/README_git → docs/README_git b/README_git → docs/README_git
diff --git a/jobs/JLANDDA_PREP_BMAT b/jobs/JLANDDA_PREP_BMAT
@@ -30,6 +30,10 @@ FILEDATE=${YYYY}${MM}${DD}.${HH}0000
 cd $MEM_WORKDIR
 
 # load modulefiles
+BUILD_VERSION_FILE="${CYCLEDIR}/versions/build.ver_${MACHINE}"
+if [ -e ${BUILD_VERSION_FILE} ]; then
+  . ${BUILD_VERSION_FILE}
+fi
 module use modulefiles; module load modules.landda
 PYTHON=$(/usr/bin/which python)
 

diff --git a/jobs/JLANDDA_PREP_EXP b/jobs/JLANDDA_PREP_EXP
@@ -42,6 +42,11 @@ mkdir -p $MEM_WORKDIR/modulefiles; cp ${CYCLEDIR}/modulefiles/build_${MACHINE}_i
 cd $MEM_WORKDIR
 
 # load modulefiles
+BUILD_VERSION_FILE="${CYCLEDIR}/versions/build.ver_${MACHINE}"
+if [ -e ${BUILD_VERSION_FILE} ]; then
+  . ${BUILD_VERSION_FILE}
+fi
+
 module use modulefiles; module load modules.landda
 
 if [[ $do_jedi == "YES" && $ATMOS_FORC == "era5" ]]; then

diff --git a/jobs/JLANDDA_RUN_ANA b/jobs/JLANDDA_RUN_ANA
@@ -41,6 +41,10 @@ KEEPJEDIDIR="YES"
 cd $MEM_WORKDIR
 
 # load modulefiles
+BUILD_VERSION_FILE="${CYCLEDIR}/versions/build.ver_${MACHINE}"
+if [ -e ${BUILD_VERSION_FILE} ]; then
+  . ${BUILD_VERSION_FILE}
+fi
 module use modulefiles; module load modules.landda
 PYTHON=$(/usr/bin/which python)
 MPIEXEC=`which mpiexec`

diff --git a/jobs/JLANDDA_RUN_FCST b/jobs/JLANDDA_RUN_FCST
@@ -48,6 +48,10 @@ RHH=$((${FCSTHR}%24))
 cd $MEM_WORKDIR
 
 # load modulefiles
+BUILD_VERSION_FILE="${CYCLEDIR}/versions/build.ver_${MACHINE}"
+if [ -e ${BUILD_VERSION_FILE} ]; then
+  . ${BUILD_VERSION_FILE}
+fi
 module use modulefiles; module load modules.landda
 PYTHON=$(/usr/bin/which python)
 MPIEXEC=`which mpiexec`

diff --git a/modulefiles/build_hera_intel.lua b/modulefiles/build_hera_intel.lua
@@ -1,77 +1,36 @@
 help([[
-loads UFS Model prerequisites for Hera/Intel
+loads modules necessary for building the land-DA workflow on Hera using Intel
 ]])
 
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/scratch1/NCEPDEV/jcsda/jedipara/spack-stack/modulefiles")
+whatis([===[Loads modules necessary for building the land-DA workflow on Hera]===])
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
-load(pathJoin("stack-intel", stack_intel_ver))
+prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
+prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
-
-stack_python_ver=os.getenv("stack_python_ver") or "3.9.12"
 load(pathJoin("stack-python", stack_python_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.23.1"
 load(pathJoin("cmake", cmake_ver))
-
-ecbuild_ver=os.getenv("ecbuild_ver") or "3.6.5"
 load(pathJoin("ecbuild", ecbuild_ver))
 
-jasper_ver=os.getenv("jasper_ver") or "2.0.32"
 load(pathJoin("jasper", jasper_ver))
-
-zlib_ver=os.getenv("zlib_ver") or "1.2.13"
 load(pathJoin("zlib", zlib_ver))
-
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
 load(pathJoin("libpng", libpng_ver))
-
-hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
 load(pathJoin("hdf5", hdf5_ver))
-
-netcdf_c_ver=os.getenv("netcdf_ver") or "4.9.0"
 load(pathJoin("netcdf-c", netcdf_c_ver))
-
-netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
-
-pio_ver=os.getenv("pio_ver") or "2.5.9"
 load(pathJoin("parallelio", pio_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
 load(pathJoin("esmf", esmf_ver))
-
-fms_ver=os.getenv("fms_ver") or "2022.04"
 load(pathJoin("fms",fms_ver))
-
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
-
-crtm_ver=os.getenv("crtm_ver") or "2.4.0"
 load(pathJoin("crtm", crtm_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
-
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
 load(pathJoin("g2tmpl", g2tmpl_ver))
-
-ip_ver=os.getenv("ip_ver") or "3.3.3"
 load(pathJoin("ip", ip_ver))
-
-sp_ver=os.getenv("sp_ver") or "2.3.3"
 load(pathJoin("sp", sp_ver))
-
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("w3emc", w3emc_ver))
-
-gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
 load(pathJoin("gftl-shared", gftl_shared_ver))
-
-mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
 load(pathJoin("mapl", mapl_ver))
 
 load("ufs-pyenv")
@@ -85,4 +44,3 @@ setenv("CMAKE_Platform", "hera.intel")
 setenv("EPICHOME", "/scratch2/NAGAPE/epic/UFS_Land-DA")
 setenv("JEDI_INSTALL", pathJoin(os.getenv("EPICHOME"),"jedi"))
 
-whatis("Description: UFS build environment")
diff --git a/modulefiles/build_orion_intel.lua b/modulefiles/build_orion_intel.lua
@@ -1,77 +1,36 @@
 help([[
-loads UFS Model prerequisites for Orion/Intel
+loads modules necessary for building the land-DA workflow on Orion using Intel
 ]])
 
-prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.3.0/envs/unified-env/install/modulefiles/Core")
-prepend_path("MODULEPATH", "/work/noaa/da/role-da/spack-stack/modulefiles")
+whatis([===[Loads modules necessary for building the land-DA workflow on Orion]===])
 
-stack_intel_ver=os.getenv("stack_intel_ver") or "2022.0.2"
-load(pathJoin("stack-intel", stack_intel_ver))
+prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack"))
+prepend_path("MODULEPATH", os.getenv("modulepath_spack_stack_jedi"))
 
-stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.1"
+load(pathJoin("stack-intel", stack_intel_ver))
 load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))
-
-stack_python_ver=os.getenv("stack_python_ver") or "3.9.7"
 load(pathJoin("stack-python", stack_python_ver))
 
-cmake_ver=os.getenv("cmake_ver") or "3.22.1"
 load(pathJoin("cmake", cmake_ver))
-
-ecbuild_ver=os.getenv("ecbuild_ver") or "3.6.5"
 load(pathJoin("ecbuild", ecbuild_ver))
 
-jasper_ver=os.getenv("jasper_ver") or "2.0.32"
 load(pathJoin("jasper", jasper_ver))
-
-zlib_ver=os.getenv("zlib_ver") or "1.2.13"
 load(pathJoin("zlib", zlib_ver))
-
-libpng_ver=os.getenv("libpng_ver") or "1.6.37"
 load(pathJoin("libpng", libpng_ver))
-
-hdf5_ver=os.getenv("hdf5_ver") or "1.14.0"
 load(pathJoin("hdf5", hdf5_ver))
-
-netcdf_c_ver=os.getenv("netcdf_ver") or "4.9.0"
 load(pathJoin("netcdf-c", netcdf_c_ver))
-
-netcdf_fortran_ver=os.getenv("netcdf_fortran_ver") or "4.6.0"
 load(pathJoin("netcdf-fortran", netcdf_fortran_ver))
-
-pio_ver=os.getenv("pio_ver") or "2.5.9"
 load(pathJoin("parallelio", pio_ver))
-
-esmf_ver=os.getenv("esmf_ver") or "8.3.0b09"
 load(pathJoin("esmf", esmf_ver))
-
-fms_ver=os.getenv("fms_ver") or "2022.04"
 load(pathJoin("fms",fms_ver))
-
-bacio_ver=os.getenv("bacio_ver") or "2.4.1"
 load(pathJoin("bacio", bacio_ver))
-
-crtm_ver=os.getenv("crtm_ver") or "2.4.0"
 load(pathJoin("crtm", crtm_ver))
-
-g2_ver=os.getenv("g2_ver") or "3.4.5"
 load(pathJoin("g2", g2_ver))
-
-g2tmpl_ver=os.getenv("g2tmpl_ver") or "1.10.2"
 load(pathJoin("g2tmpl", g2tmpl_ver))
-
-ip_ver=os.getenv("ip_ver") or "3.3.3"
 load(pathJoin("ip", ip_ver))
-
-sp_ver=os.getenv("sp_ver") or "2.3.3"
 load(pathJoin("sp", sp_ver))
-
-w3emc_ver=os.getenv("w3emc_ver") or "2.9.2"
 load(pathJoin("w3emc", w3emc_ver))
-
-gftl_shared_ver=os.getenv("gftl_shared_ver") or "v1.5.0"
 load(pathJoin("gftl-shared", gftl_shared_ver))
-
-mapl_ver=os.getenv("mapl_ver") or "2.22.0-esmf-8.3.0b09"
 load(pathJoin("mapl", mapl_ver))
 
 load("ufs-pyenv")
@@ -84,5 +43,3 @@ setenv("CMAKE_Platform", "orion.intel")
 setenv("EPICHOME", "/work/noaa/epic/UFS_Land-DA")
 setenv("JEDI_INSTALL", pathJoin(os.getenv("EPICHOME"),"jedi"))
 
-whatis("Description: UFS build environment")
-
diff --git a/check_release_outputs.sh → parm/check_release_outputs.sh b/check_release_outputs.sh → parm/check_release_outputs.sh
diff --git a/parm/land_analysis_era5_orion.yaml b/parm/land_analysis_era5_orion.yaml
@@ -10,7 +10,7 @@ workflow:
     MACHINE: "orion"
     ACCOUNT: "epic"
     EXP_NAME: "LETKF"
-    EXP_BASEDIR: "/work/noaa/epic/uname/LAND-DA-ROOT"
+    EXP_BASEDIR: "/work/noaa/epic/username/LAND-DA-ROOT"
     JEDI_INSTALL: "/work/noaa/epic/UFS_Land-DA/jedi"
     LANDDA_INPUTS: "/work/noaa/epic/UFS_Land-DA/inputs"
     FORCING: "era5"