Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update release branches for submodules, bugfix for compiling FMS, remove WW3 #50

Merged
merged 9 commits into from
Feb 7, 2020
+13,372 −13,599
Merged

Update release branches for submodules, bugfix for compiling FMS, remove WW3 #50

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4a0566c
Remove WW3 submodule
DusanJovic-NOAA Feb 6, 2020
ab2b1ea
Update submodules for UFS public release
climbfuji Feb 6, 2020
6c54515
Merge branch 'no_ww3' of https://github.com/DusanJovic-NOAA/ufs-weath…
climbfuji Feb 6, 2020
6e94af3
Remove affinity.c from list of files to compile from FMS; this file i…
climbfuji Feb 6, 2020
65553c2
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Feb 6, 2020
2b2f81a
build.sh: help user to understand what build.sh is doing/where it is …
climbfuji Feb 7, 2020
c9c3457
Update date tag for regression test baseline
climbfuji Feb 7, 2020
74f110c
Revert change to .gitmodules and update submodule pointer for FV3
climbfuji Feb 7, 2020
61c3d3a
Regression test logs for hera and cheyenne
climbfuji Feb 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = ufs_public_release
branch = release/public-v1
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
branch = ufs_public_release
branch = release/public-v1
[submodule "FMS"]
path = FMS
url = https://github.com/NOAA-GFDL/FMS
branch = master
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
branch = develop
branch = release/2019.01
[submodule "stochastic_physics"]
path = stochastic_physics
url = https://github.com/noaa-psd/stochastic_physics
branch = ufs_public_release
branch = release/public-v1
1 change: 0 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,6 @@ add_library(
FMS/mosaic/interp.c
FMS/mosaic/mosaic_util.c
FMS/mosaic/read_mosaic.c
FMS/affinity/affinity.c
FMS/mpp/nsclock.c
FMS/mpp/threadloc.c
)
Expand Down
2 changes: 1 addition & 1 deletion FMS
Open in desktop
Submodule FMS updated 4 files
+6 −5 include/fms_platform.h
+4 −4 interpolator/interpolator.F90
+2 −2 mosaic/create_xgrid.c
+3 −27 mosaic/mosaic_util.c
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+2 −2 .gitmodules
+1 −1 atmos_cubed_sphere
2 changes: 1 addition & 1 deletion NEMS
Open in desktop
Submodule NEMS updated 1 files
+2 −2 src/module_NEMS_Rusage.F90
1 change: 0 additions & 1 deletion WW3
Open in desktop
Submodule WW3 deleted from 3063a4
9 changes: 8 additions & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,18 @@ mkdir ${BUILD_DIR}

CCPP_SUITES="${CCPP_SUITES:-FV3_GFS_v15p2}"

set +e
echo "Calling ccpp_prebuild.py ..."
./FV3/ccpp/framework/scripts/ccpp_prebuild.py \
--config=FV3/ccpp/config/ccpp_prebuild_config.py \
--static \
--suites=${CCPP_SUITES} \
--builddir=${BUILD_DIR}/FV3 > ${BUILD_DIR}/ccpp_prebuild.log 2>&1
if [ $? -ne 0 ]; then
echo "Call to ccpp_prebuild.py failed, check ${BUILD_DIR}/ccpp_prebuild.log"
exit 1
fi
set -e

source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_SCHEMES.sh
source ${BUILD_DIR}/FV3/ccpp/physics/CCPP_CAPS.sh
Expand All @@ -38,4 +45,4 @@ CMAKE_FLAGS+=" -DCCPP=ON -DSTATIC=ON -DSUITES=${CCPP_SUITES} -DNETCDF_DIR=${NETC
cd ${BUILD_DIR}
cmake .. ${CMAKE_FLAGS}
make -j ${BUILD_JOBS:-4}
cp NEMS.exe ${MYDIR}/ufs_weather_model
cp -v NEMS.exe ${MYDIR}/ufs_weather_model
2 changes: 1 addition & 1 deletion stochastic_physics
Open in desktop
Submodule stochastic_physics updated from f8b5c3 to 2471fc
4 changes: 2 additions & 2 deletions tests/rt.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,9 +345,9 @@ while getopts ":cfsl:mkreh" opt; do
done

if [[ $MACHINE_ID = cheyenne.* ]]; then
RTPWD=${RTPWD:-$DISKNM/ufs-public-release-20200121/${COMPILER^^}}
RTPWD=${RTPWD:-$DISKNM/ufs-public-release-20200206/${COMPILER^^}}
else
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-20200121}
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/ufs-public-release-20200206}
fi

shift $((OPTIND-1))
Expand Down