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.

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

Fix Lambert Conformal Conic mapping in the write component on the southern hemisphere #1087

Merged
merged 17 commits into from
Mar 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 1 files
+39 −29 io/module_wrt_grid_comp.F90
320 changes: 160 additions & 160 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

1,036 changes: 518 additions & 518 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,064 changes: 534 additions & 530 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

320 changes: 160 additions & 160 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,048 changes: 524 additions & 524 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

932 changes: 466 additions & 466 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,103 changes: 537 additions & 566 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

688 changes: 344 additions & 344 deletions tests/RegressionTests_wcoss_cray.log

Large diffs are not rendered by default.

1,123 changes: 548 additions & 575 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/ci/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From noaaemc/ubuntu-hpc:v1.8b
From noaaemc/ubuntu-hpc:v1.9b

ENV HOME=/home/builder
COPY --chown=builder:builder . $HOME/ufs-weather-model
Expand Down
4 changes: 2 additions & 2 deletions tests/ci/ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ if [ $BUILD = "true" ]; then
elif [ $RUN == "true" ]; then

docker volume rm -f DataVolume >/dev/null &&
docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20211203
docker run -d --rm -v DataVolume:/tmp minsukjinoaa/input-data:20211210

docker create -u builder -e "CI_TEST=true" -e "USER=builder" \
-e "RT_MACHINE=linux.gnu" -e "RT_COMPILER=gnu" \
-w "/home/builder/ufs-weather-model/tests" \
-v DataVolume:/home/builder/data/NEMSfv3gfs \
--shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.8b \
--shm-size=512m --name my-container noaaemc/ubuntu-hpc:v1.9b \
/bin/bash -c "./opnReqTest -n ${TEST_NAME} -c ${TEST_CASE} -x"

cd $GITHUB_WORKSPACE
Expand Down
2 changes: 1 addition & 1 deletion tests/ci/ci.test
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ control
thr mpi dcp rst bit dbg
regional_control
thr dcp
cpld_control_c96_p8
cpld_control_c96_noaero_p8
rst dbg
7 changes: 4 additions & 3 deletions tests/opnReqTest
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ cleanup() {
}

find_build() {
cat rt.conf rt_gnu.conf >rt.temp
local compile_line=''
local run_line=''
while read -r line || [ "$line" ]; do
Expand All @@ -70,7 +71,7 @@ find_build() {
break
fi
fi
done <'rt.conf'
done <'rt.temp'
}

build_opnReqTests() {
Expand Down Expand Up @@ -623,9 +624,9 @@ fi
mkdir -p ${STMP}/${USER}
NEW_BASELINE=${STMP}/${USER}/FV3_OPNREQ_TEST/OPNREQ_TEST
RTPWD=${NEW_BASELINE}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211203}
INPUTDATA_ROOT=${INPUTDATA_ROOT:-$DISKNM/NEMSfv3gfs/input-data-20211210}
INPUTDATA_ROOT_WW3=${INPUTDATA_ROOT}/WW3_input_data_20211113/
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20210717}
INPUTDATA_ROOT_BMIC=${INPUTDATA_ROOT_BMIC:-$DISKNM/NEMSfv3gfs/BM_IC-20220207}

rm -rf $NEW_BASELINE
mkdir -p $NEW_BASELINE
Expand Down
1 change: 1 addition & 0 deletions tests/opnReqTests/dbg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ elif [[ $application == 'cpld' ]]; then
| sed -E "s/2021-03-23-21600/2021-03-22-43200/g" \
| sed -E "s/sfcf021.tile[1-6].nc ?//g" \
| sed -E "s/atmf021.tile[1-6].nc ?//g" \
| sed -E "s/(gocart.inst_aod.202103)23_0600z.nc4/\122_1200z.nc4/g" \
| sed -e "s/^ *//" -e "s/ *$//")
fi

Expand Down
11 changes: 11 additions & 0 deletions tests/opnReqTests/thr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,16 @@ elif [[ $application == 'regional' ]]; then
elif [[ $application == 'cpld' ]]; then
if [[ $CI_TEST != 'true' ]]; then
if [[ $TEST_NAME == 'cpld_control_c96_p8' ]]; then
INPES=3
JNPES=4
med_petlist_bounds="0 71"
chm_petlist_bounds="0 71"
atm_petlist_bounds="0 77"
ocn_petlist_bounds="78 107"
ice_petlist_bounds="108 119"
TASKS=$((INPES*JNPES*6 + WRITE_GROUP*WRTTASK_PER_GROUP + 30 + 12))
NODES=$(((TASKS+TPN-1)/TPN))
elif [[ $TEST_NAME == 'cpld_control_c96_noaero_p8' ]]; then
INPES=3
JNPES=4
med_petlist_bounds="0 71"
Expand All @@ -29,6 +39,7 @@ elif [[ $application == 'cpld' ]]; then
INPES=3
JNPES=4
med_petlist_bounds="0 71"
chm_petlist_bounds="0 71"
atm_petlist_bounds="0 77"
ocn_petlist_bounds="78 97"
ice_petlist_bounds="98 107"
Expand Down
1 change: 1 addition & 0 deletions tests/opnReqTests/wrt_env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export WRITE_GROUP=${WRITE_GROUP}
export WRTTASK_PER_GROUP=${WRTTASK_PER_GROUP}
export NPROC_ICE=${NPROC_ICE:-}
export med_petlist_bounds="${med_petlist_bounds:-}"
export chm_petlist_bounds="${chm_petlist_bounds:-}"
export atm_petlist_bounds="${atm_petlist_bounds:-}"
export ocn_petlist_bounds="${ocn_petlist_bounds:-}"
export ice_petlist_bounds="${ice_petlist_bounds:-}"
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220316
BL_DATE=20220318
if [[ $MACHINE_ID = hera.* ]] || [[ $MACHINE_ID = orion.* ]] || [[ $MACHINE_ID = cheyenne.* ]] || [[ $MACHINE_ID = gaea.* ]] || [[ $MACHINE_ID = jet.* ]] || [[ $MACHINE_ID = s4.* ]]; then
RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}
else
Expand Down