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

Remove IPD (step 1) #331

Merged
merged 18 commits into from
Dec 29, 2020
Merged

Remove IPD (step 1) #331

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
3d7e07b
Update .gitmodules and submodule pointer for fv3atm for code review a…
climbfuji Dec 15, 2020
ed5869b
Make CCPP=Y the default in tests/compile.sh; remove CCPP=Y from tests…
climbfuji Dec 15, 2020
0b2bab5
Bugfix in compile.sh: CCPP_SUITES argument not extracted correctly if…
climbfuji Dec 15, 2020
01758ac
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 15, 2020
999036b
Update submodule pointer for fv3atm
climbfuji Dec 16, 2020
79fd1f7
Bugfix in tests/rt.sh: CCPP=Y is no longer part of MAKEOPT
climbfuji Dec 16, 2020
6c3e5fa
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 18, 2020
ba6e1fd
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 28, 2020
f696c87
Update submodule pointer for MOM6 to point to current head of dev/emc…
climbfuji Dec 28, 2020
6733f63
Update submodule pointer for fv3atm; skip-ci
climbfuji Dec 28, 2020
1bed095
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
climbfuji Dec 28, 2020
ad32c94
Fix unit tests
climbfuji Dec 28, 2020
674b865
Unit test logs for hera.intel (update) and hera.gnu (new)
climbfuji Dec 28, 2020
89bb44a
Copy modulefiles/wcoss_cray/fv3 to modulefiles/wcoss_cray/fv3_debug
climbfuji Dec 28, 2020
f594dff
Regression test logs for cheyenne.gnu, cheyenne.intel, gaea.intel, he…
climbfuji Dec 29, 2020
8503101
Increase wallclock time for fv3_ccpp_regional_quilt and fv3_ccpp_regi…
climbfuji Dec 29, 2020
4b9e8a0
Regression test logs for jet.intel and wcoss_cray; skip-ci
climbfuji Dec 29, 2020
68805a8
Revert change to .gitmodules and update submodule pointer for fv3atm
climbfuji Dec 29, 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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/climbfuji/fv3atm
branch = remove_ipd
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 146 files
64 changes: 30 additions & 34 deletions tests/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,46 +100,42 @@ else
CMAKE_FLAGS="${CMAKE_FLAGS} -DMULTI_GASES=OFF"
fi

if [[ "${MAKE_OPT}" == *"CCPP=Y"* ]]; then
# FIXME - create CCPP include directory before building FMS to avoid
# gfortran warnings of non-existent include directory (adding
# -Wno-missing-include-dirs) to the GNU compiler flags does not work,
# see also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55534);
# this line can be removed once FMS becomes a pre-installed library
mkdir -p $PATHTR/FV3/ccpp/include
# Similar for this directory, which apparently never gets populated
mkdir -p $PATHTR/FMS/fms2_io/include

# FIXME - create CCPP include directory before building FMS to avoid
# gfortran warnings of non-existent include directory (adding
# -Wno-missing-include-dirs) to the GNU compiler flags does not work,
# see also https://gcc.gnu.org/bugzilla/show_bug.cgi?id=55534);
# this line can be removed once FMS becomes a pre-installed library
mkdir -p $PATHTR/FV3/ccpp/include
# Similar for this directory, which apparently never gets populated
mkdir -p $PATHTR/FMS/fms2_io/include
CMAKE_FLAGS="${CMAKE_FLAGS} -DCCPP=ON -DMPI=ON"
climbfuji marked this conversation as resolved.
Show resolved Hide resolved

CMAKE_FLAGS="${CMAKE_FLAGS} -DCCPP=ON -DMPI=ON"

if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Debug"
elif [[ "${MAKE_OPT}" == *"REPRO=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Bitforbit"
else
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Release"
if [[ "${MACHINE_ID}" == "jet.intel" ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DSIMDMULTIARCH=ON"
fi
fi

if [[ "${MAKE_OPT}" == *"32BIT=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DDYN32=ON"
else
CMAKE_FLAGS="${CMAKE_FLAGS} -DDYN32=OFF"
if [[ "${MAKE_OPT}" == *"DEBUG=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Debug"
elif [[ "${MAKE_OPT}" == *"REPRO=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Bitforbit"
else
CMAKE_FLAGS="${CMAKE_FLAGS} -DCMAKE_BUILD_TYPE=Release"
if [[ "${MACHINE_ID}" == "jet.intel" ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DSIMDMULTIARCH=ON"
fi
fi

# Check if suites argument is provided or not
set +ex
TEST=$( echo $MAKE_OPT | grep -e "SUITES=" )
if [[ $? -eq 0 ]]; then
CCPP_SUITES=$( echo $MAKE_OPT | sed 's/.* SUITES=//' | sed 's/ .*//' )
echo "Compiling suites ${CCPP_SUITES}"
fi
set -ex
if [[ "${MAKE_OPT}" == *"32BIT=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DDYN32=ON"
else
CMAKE_FLAGS="${CMAKE_FLAGS} -DDYN32=OFF"
fi

# Check if suites argument is provided or not
set +ex
TEST=$( echo $MAKE_OPT | grep -e "SUITES=" )
if [[ $? -eq 0 ]]; then
CCPP_SUITES=$( echo $MAKE_OPT | sed 's/.*SUITES=//' | sed 's/ .*//' )
echo "Compiling suites ${CCPP_SUITES}"
fi
set -ex

if [[ "${MAKE_OPT}" == *"WW3=Y"* ]]; then
CMAKE_FLAGS="${CMAKE_FLAGS} -DWW3=Y"
Expand Down
447 changes: 224 additions & 223 deletions tests/rt.conf
View file
Open in desktop

Large diffs are not rendered by default.

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 @@ -614,11 +614,11 @@ EOF
fi

# Set RT_SUFFIX (regression test run directories and log files) and BL_SUFFIX
# (regression test baseline directories) for REPRO (IPD, CCPP) or PROD (CCPP) runs
# (regression test baseline directories) for REPRO or PROD runs
if [[ ${MAKE_OPT^^} =~ "REPRO=Y" ]]; then
RT_SUFFIX="_repro"
BL_SUFFIX="_repro"
elif [[ ${MAKE_OPT^^} =~ "CCPP=Y" ]]; then
else
RT_SUFFIX="_prod"
BL_SUFFIX="_ccpp"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can BL_SUFFIX be removed?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was thinking to do this, yes, if @junwang-noaa and you are ok. I made the change and will keep it until the last minute (before creating new baselines), however, so that I can test against the existing baselines first when it is time to commit. This way we know for sure that the PR doesn't change anything we don't expect it to change.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it is good to remove all the ccpp in the test name including both prod and repro

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I said, this will require several changes in fv3_conf/* files and I would really prefer to do this separately. It's ok to remove the _ccpp and _prod suffices as suggested by Dusan, because that is a change in this file only, but renaming all tests is too much for this commit in my opinion.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you want to have incremental commits, that is fine, please specify that in your PR. maybe we can call this IPD removal Part1.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, I updated the issue and the two PRs.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also if part 2 is renaming the test. Maybe we also need to have part3 to remove the "ifdef CCPP" in fv3 code and remove the -DCCPP=ON? So far from here it is not clear to me what the "Remove IPD" means

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please read the issue.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal will be part of one of the next steps when we rename all regression tests etc.

fi
Expand Down
4 changes: 2 additions & 2 deletions tests/rt_35d.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y | | hera.intel orion.intel | fv3 | |
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y | | hera.intel orion.intel | fv3 | |
RUN | cpld_bmark_35d | | | fv3 | | 2012010100
RUN | cpld_bmark_35d | | | fv3 | | 2012040100
RUN | cpld_bmark_35d | | | fv3 | | 2012070100
Expand All @@ -8,7 +8,7 @@ RUN | cpld_bmark_35d | | | fv3 | | 2013040100
RUN | cpld_bmark_35d | | | fv3 | | 2013070100
RUN | cpld_bmark_35d | | | fv3 | | 2013100100

COMPILE | CCPP=Y SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y | | hera.intel orion.intel | fv3 | |
COMPILE | SUITES=FV3_GFS_2017_coupled,FV3_GFS_2017_satmedmf_coupled,FV3_GFS_v15p2_coupled S2S=Y WW3=Y | | hera.intel orion.intel | fv3 | |
RUN | cpld_bmark_wave_35d | | | fv3 | | 2012010100
RUN | cpld_bmark_wave_35d | | | fv3 | | 2012040100
RUN | cpld_bmark_wave_35d | | | fv3 | | 2012070100
Expand Down
Loading