diff --git a/.gitmodules b/.gitmodules index be145c18..8288e726 100644 --- a/.gitmodules +++ b/.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 diff --git a/build.sh b/build.sh index a4362a80..a4d5f009 100755 --- a/build.sh +++ b/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} diff --git a/sorc/mpas b/sorc/mpas index 41e9a3fb..041ea960 160000 --- a/sorc/mpas +++ b/sorc/mpas @@ -1 +1 @@ -Subproject commit 41e9a3fb8ca6b9250a7405209a5c60996318409f +Subproject commit 041ea9608c99246fc50051fcf1024c35d2da807f