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

Remove interstitial variables for land and ice emissivity and update the land and ice emissivity in the routine setemis in CCPP #821

Merged
merged 37 commits into from
Oct 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
7ea6e54
updating fv3atm to point to branch SM_Sept21_PR
SMoorthi-emc Sep 21, 2021
4520989
after syncing submodules
SMoorthi-emc Sep 22, 2021
769c205
Merge remote-tracking branch 'upstream/develop' into SM_Sept21_PR
SMoorthi-emc Sep 22, 2021
56bab71
after merging with develop on Sept 23
SMoorthi-emc Sep 24, 2021
c6fda8e
after merging with develop
SMoorthi-emc Sep 24, 2021
a74336a
after merging with ufs-weather/develop
SMoorthi-emc Sep 27, 2021
85f8e33
after syncing submodules
SMoorthi-emc Sep 28, 2021
e53fe97
after merge with devlop
SMoorthi-emc Sep 30, 2021
6768697
fter merging with ufs/develop
SMoorthi-emc Sep 30, 2021
dcabb4e
after mergfing with ufs/develop
SMoorthi-emc Oct 1, 2021
50340a2
after merging with ufs-weather/develop
SMoorthi-emc Oct 4, 2021
125cab4
after merge with develop
SMoorthi-emc Oct 7, 2021
8934d3f
after merging with ufs/develop
SMoorthi-emc Oct 7, 2021
19f084b
Update to regression test setup for correctly setting cplice for coup…
climbfuji Oct 8, 2021
32af536
after updating FV3
SMoorthi-emc Oct 10, 2021
084705b
additional updates to emissivity calculation etc
SMoorthi-emc Oct 15, 2021
6831b3b
after merging with ufs/develop
SMoorthi-emc Oct 18, 2021
feb5489
Merge pull request #2 from climbfuji/set_cplice_correctly_SM_Sept21_PR
SMoorthi-emc Oct 19, 2021
a4e8260
after merging with ufs/develop
SMoorthi-emc Oct 19, 2021
9f30088
after updating fv3 pointer
SMoorthi-emc Oct 19, 2021
8883cbe
updating FV3 pointer
SMoorthi-emc Oct 19, 2021
9b7ef1c
after changing BL_DATE
SMoorthi-emc Oct 19, 2021
fa82c18
Merge branch 'SM_Sept21_PR' of https://github.com/SMoorthi-emc/ufs-we…
SMoorthi-emc Oct 20, 2021
31a5bbe
after reg test on hera
SMoorthi-emc Oct 20, 2021
2ffe013
update fv3 revision
junwang-noaa Oct 21, 2021
53d7b8c
RT JOBS PASSED: hera.gnu. Log file uploaded.
BrianCurtis-NOAA Oct 21, 2021
d639458
RT JOBS PASSED: hera.intel. Log file uploaded.
BrianCurtis-NOAA Oct 21, 2021
f2fdedb
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Oct 21, 2021
c9f1da9
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Oct 21, 2021
8f3c45d
commenting in rt.con test fv3_gsd_diag_debug
SMoorthi-emc Oct 21, 2021
ae0d9ae
updatng FV3 pointer
SMoorthi-emc Oct 21, 2021
13c099c
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Oct 21, 2021
0face3e
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Oct 22, 2021
8491ef3
uploading wcoss_dell_p3 log
SMoorthi-emc Oct 22, 2021
60ee9dd
adding wcoss_cray log
SMoorthi-emc Oct 22, 2021
6e27429
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Oct 22, 2021
c71befa
updating FV3 pointer
SMoorthi-emc Oct 22, 2021
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
411 changes: 199 additions & 212 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

679 changes: 323 additions & 356 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

699 changes: 343 additions & 356 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

216 changes: 108 additions & 108 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

690 changes: 308 additions & 382 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

892 changes: 423 additions & 469 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

689 changes: 328 additions & 361 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

409 changes: 188 additions & 221 deletions tests/RegressionTests_wcoss_cray.log

Large diffs are not rendered by default.

725 changes: 409 additions & 316 deletions tests/RegressionTests_wcoss_dell_p3.log

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,7 @@ export H2O_PHYS=.false.
export CPL=.false.
export CPLCHM=.false.
export CPLFLX=.false.
export CPLICE=.false.
export CPLWAV=.false.
export CPLWAV2ATM=.false.
export DAYS=1
Expand Down Expand Up @@ -792,6 +793,7 @@ export KTHERM=2
export TFREEZE_OPTION=mushy

export CPLFLX=.true.
export CPLICE=.true.
export CPL=.true.
export MIN_SEAICE=1.0e-11

Expand Down
1 change: 1 addition & 0 deletions tests/parm/cpld_control.nml.IN
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ deflate_level=1
cplwav = @[CPLWAV]
cplwav2atm = @[CPLWAV2ATM]
cplflx = @[CPLFLX]
cplice = @[CPLICE]
min_seaice = @[MIN_SEAICE]
use_cice_alb = @[USE_CICE_ALB]
frac_grid = @[FRAC_GRID]
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ RUN | control_thompson_extdiag_debug
RUN | regional_control_debug | | fv3 |
RUN | regional_quilt_debug | | fv3 |
RUN | fv3_gsd_debug | | fv3 |
RUN | fv3_gsd_diag_debug | | fv3 |
#RUN | fv3_gsd_diag_debug | | fv3 |
RUN | fv3_rrfs_v1beta_debug | | fv3 |
RUN | fv3_rrfs_v1alpha_debug | | fv3 |

Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ if [[ $TESTS_FILE =~ '35d' ]]; then
TEST_35D=true
fi

BL_DATE=20211006
BL_DATE=20211019
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