Merge branch 'develop' into feature/rename_fv3data

.gitmodules

@@ -65,8 +65,8 @@
 	ignore = all
 [submodule "sorc/mpas"]
 	path = sorc/mpas
-	url = https://github.com/MPAS-Dev/MPAS-Model
-	branch = release-stable 
+	url = https://github.com/NOAA-GSL/MPAS-Model
+	branch = gsl/develop
 	ignore = all
 [submodule "sorc/mpas-jedi"]
 	path = sorc/mpas-jedi

build.sh

@@ -92,6 +92,9 @@ case ${BUILD_TARGET} in
     ;;
 esac
 
+# tweak sorc/mpas/src/core_init_atmosphere/mpas_init_atm_cases.F to make building work
+sed -i -e "5549 s/.*/call mpas_log_write('Interpolating SOILM000')/" sorc/mpas/src/core_init_atmosphere/mpas_init_atm_cases.F
+
 # Set default number of build jobs based on machine
 if [[ $BUILD_TARGET == 'orion' ]]; then # lower due to memory limit on login nodes
   BUILD_JOBS=${BUILD_JOBS:-4}

modulefiles/RDAS/hera.gnu.lua

@@ -0,0 +1,90 @@
+help([[
+Load environment for running the RDAS application with Intel compilers and MPI.
+]])
+
+local pkgName    = myModuleName()
+local pkgVersion = myModuleVersion()
+local pkgNameVer = myModuleFullName()
+
+prepend_path("MODULEPATH", '/contrib/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core')
+
+-- below two lines get us access to the spack-stack modules
+load("stack-gcc/9.2.0")
+load("stack-openmpi/4.1.5")
+-- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed
+load("cmake/3.23.1")
+load("gettext/0.19.8.1")
+--load("libunistring/1.1")
+--load("libidn2/2.3.4")
+load("pcre2/10.42")
+load("curl/8.4.0")
+load("zlib/1.2.13")
+load("git/2.18.0")
+load("pkg-config/0.27.1")
+load("hdf5/1.14.0")
+load("parallel-netcdf/1.12.2")
+load("netcdf-c/4.9.2")
+load("nccmp/1.9.0.1")
+load("netcdf-fortran/4.6.1")
+load("nco/5.0.6")
+load("parallelio/2.5.10")
+load("wget/1.14")
+load("boost/1.83.0")
+load("bufr/12.0.1")
+load("git-lfs/2.10.0")
+load("ecbuild/3.7.2")
+load("openjpeg/2.3.1")
+load("eccodes/2.32.0")
+load("eigen/3.4.0")
+load("openblas/0.3.24")
+load("eckit/1.24.5")
+load("fftw/3.3.10")
+load("fckit/0.11.0")
+load("fiat/1.2.0")
+--load("ectrans/1.2.0")
+load("atlas/0.35.1")
+load("sp/2.5.0")
+load("gsl-lite/0.37.0")
+load("libjpeg/2.1.0")
+load("krb5/1.15.1")
+load("libtirpc/1.3.3")
+load("hdf/4.2.15")
+load("jedi-cmake/1.4.0")
+load("libpng/1.6.37")
+load("libxt/1.1.5")
+load("libxmu/1.1.4")
+load("libxpm/4.11.0")
+load("libxaw/1.0.13")
+load("udunits/2.2.28")
+load("ncview/2.1.9")
+load("netcdf-cxx4/4.3.1")
+load("json/3.10.5")
+--load("crtm/v2.4_jedi")
+load("rocoto/1.3.6")
+load("prod_util/2.1.1")
+load("fms/2023.04")
+
+load("py-jinja2/3.0.3")
+load("py-netcdf4/1.5.8")
+load("py-pybind11/2.11.0")
+load("py-pycodestyle/2.11.0")
+load("py-pyyaml/6.0")
+load("py-scipy/1.11.3")
+load("py-xarray/2023.7.0")
+
+-- hack for wxflow
+prepend_path("PYTHONPATH", "/scratch1/NCEPDEV/da/python/gdasapp/wxflow/20240307/src")
+
+setenv("CC","mpicc")
+setenv("FC","mpif90")
+setenv("CXX","mpicxx")
+
+local mpiexec = '/apps/slurm_hera/default/bin/srun'
+local mpinproc = '-n'
+setenv('MPIEXEC_EXEC', mpiexec)
+setenv('MPIEXEC_NPROC', mpinproc)
+
+whatis("Name: ".. pkgName)
+whatis("Version: ".. pkgVersion)
+whatis("Category: RDASApp")
+whatis("Description: Load all libraries needed for RDASApp")

modulefiles/RDAS/jet.gnu.lua

@@ -0,0 +1,91 @@
+help([[
+Load environment for running the RDAS application with Intel compilers and MPI.
+]])
+
+local pkgName    = myModuleName()
+local pkgVersion = myModuleVersion()
+local pkgNameVer = myModuleFullName()
+
+prepend_path("MODULEPATH", '/contrib/spack-stack/spack-stack-1.8.0/envs/ue-gcc-9.2.0/install/modulefiles/Core')
+
+-- below two lines get us access to the spack-stack modules
+load("stack-gcc/9.2.0")
+load("stack-openmpi/4.1.6")
+-- JCSDA has 'jedi-fv3-env/unified-dev', but we should load these manually as needed
+load("cmake/3.27.9")
+load("gettext/0.22.5")
+--load("libunistring/1.1")
+--load("libidn2/2.3.4")
+----load("pcre2/10.42")
+load("curl/8.7.1")
+load("zlib-ng/2.1.6")
+load("git/2.18.0")
+----load("pkg-config/0.27.1")
+load("hdf5/1.14.3")
+load("parallel-netcdf/1.12.3")
+load("netcdf-c/4.9.2")
+load("nccmp/1.9.0.1")
+load("netcdf-fortran/4.6.1")
+load("nco/5.1.6")
+load("parallelio/2.6.2")
+load("wget/1.14")
+load("boost/1.84.0")
+load("bufr/12.1.0")
+load("git-lfs/2.10.0")
+load("ecbuild/3.7.2")
+load("openjpeg/2.3.1")
+load("eccodes/2.33.0")
+load("eigen/3.4.0")
+load("openblas/0.3.24")
+load("eckit/1.27.0")
+load("fftw/3.3.10")
+load("fckit/0.11.0")
+load("fiat/1.2.0")
+--load("ectrans/1.2.0")
+load("atlas/0.38.1")
+load("sp/2.5.0")
+load("gsl-lite/0.37.0")
+load("libjpeg/2.1.0")
+load("krb5/1.15.1")
+load("libtirpc/1.3.3")
+load("hdf/4.2.15")
+load("jedi-cmake/1.4.0")
+load("libpng/1.6.37")
+load("libxt/1.3.0")
+load("libxmu/1.1.4")
+load("libxpm/4.11.0")
+load("libxaw/1.0.15")
+load("udunits/2.2.28")
+load("ncview/2.1.9")
+load("netcdf-cxx4/4.3.1")
+load("json/3.11.2")
+--load("crtm/v2.4_jedi")
+load("rocoto/1.3.6")
+load("prod_util/2.1.1")
+
+load("fms/2024.02")
+
+load("py-jinja2/3.1.2")
+load("py-netcdf4/1.5.8")
+load("py-pybind11/2.11.0")
+load("py-pycodestyle/2.11.0")
+load("py-pyyaml/6.0")
+load("py-scipy/1.12.0")
+load("py-xarray/2023.7.0")
+
+-- hack for wxflow
+prepend_path("PYTHONPATH", "/lfs5/BMC/nrtrr/RDAS_DATA/python/20240307")
+
+setenv("CC","mpicc")
+setenv("FC","mpif90")
+setenv("CXX","mpicxx")
+
+local mpiexec = '/apps/slurm/default/bin/srun'
+local mpinproc = '-n'
+setenv('MPIEXEC_EXEC', mpiexec)
+setenv('MPIEXEC_NPROC', mpinproc)
+
+whatis("Name: ".. pkgName)
+whatis("Version: ".. pkgVersion)
+whatis("Category: RDASApp")
+whatis("Description: Load all libraries needed for RDASApp")