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

incorporate csawMG update and pass both intel and GNU RT tests #2130

Closed
wants to merge 1 commit into from
Closed

incorporate csawMG update and pass both intel and GNU RT tests #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/AnningCheng-NOAA/fv3atm
branch = csawv2
## url = https://github.com/NOAA-EMC/fv3atm
## branch = develop
[submodule "WW3"]
path = WW3
url = https://github.com/NOAA-EMC/WW3
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 2 files
+4 −2 .gitmodules
+1 −1 ccpp/physics
2,349 changes: 1,216 additions & 1,133 deletions tests/logs/RegressionTests_hera.log
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions tests/parm/control_csawmg.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,11 @@
mountain = @[MOUNTAIN]
ncep_ic = .false.
d_con = 1.
hord_mt = 6
hord_vt = 6
hord_tm = 6
hord_dp = 6
hord_tr = 13
hord_mt = 5
hord_vt = 5
hord_tm = 5
hord_dp = -5
hord_tr = 8
adjust_dry_mass = .false.
consv_te = 1.
do_sat_adj = .false.
Expand Down
10 changes: 5 additions & 5 deletions tests/parm/csawmg3shoc127.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
mountain = @[MOUNTAIN]
ncep_ic = .false.
d_con = 1.
hord_mt = 6
hord_vt = 6
hord_tm = 6
hord_dp = 6
hord_tr = 13
hord_mt = 5
hord_vt = 5
hord_tm = 5
hord_dp = -5
hord_tr = 8
adjust_dry_mass = .false.
consv_te = 1.
consv_am = .false.
Expand Down
10 changes: 5 additions & 5 deletions tests/parm/csawmgshoc.nml.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@
mountain = @[MOUNTAIN]
ncep_ic = .false.
d_con = 1.
hord_mt = 6
hord_vt = 6
hord_tm = 6
hord_dp = 6
hord_tr = 13
hord_mt = 5
hord_vt = 5
hord_tm = 5
hord_dp = -5
hord_tr = 8
adjust_dry_mass = .false.
consv_te = 1.
consv_am = .false.
Expand Down
9 changes: 9 additions & 0 deletions tests/rt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,10 @@ RUN | control_csawmg | - noaacloud
RUN | control_csawmgt | - noaacloud | baseline |
RUN | control_ras | - noaacloud acorn | baseline |

COMPILE | csawmg | gnu | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_csawmg,FV3_GFS_v16_ras | + hera hercules | fv3 |
RUN | control_csawmg | + hera hercules | baseline |
RUN | control_csawmgt | + hera hercules | baseline |

# Run WAM test in REPRO mode to avoid numerical instability in the deep atmosphere
COMPILE | wam | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON | - noaacloud | fv3 |
RUN | control_wam | - noaacloud | baseline |
Expand Down Expand Up @@ -182,6 +186,11 @@ RUN | rrfs_v1beta_debug | - noaacloud
RUN | rap_clm_lake_debug | - noaacloud | baseline |
RUN | rap_flake_debug | - noaacloud | baseline |
RUN | gnv1_c96_no_nest_debug | - noaacloud | baseline |
### DEBUG ATM tests ###
COMPILE | atm_debug_dyn32 | gnu | -DAPP=ATM -DDEBUG=ON -D32BIT=ON -DCCPP_SUITES=FV3_HRRR,FV3_GFS_v16,FV3_GFS_v16_csawmg,FV3_GFS_v16_ras,FV3_GFS_v17_p8,FV3_GFS_v15_thompson_mynn_lam3km,FV3_RAP,FV3_RAP_unified_ugwp,FV3_RAP_cires_ugwp,FV3_RAP_flake,FV3_RAP_clm_lake,FV3_RAP_noah,FV3_RAP_sfcdiff,FV3_RAP_noah_sfcdiff_cires_ugwp,FV3_RRFS_v1beta,FV3_HRRR_c3,FV3_HRRR_gf,FV3_global_nest_v1 | + hera hercules | fv3 |
RUN | control_csawmg_debug | + hera hercules | baseline |
RUN | control_csawmgt_debug | + hera hercules | baseline |


COMPILE | wam_debug | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16_fv3wam -D32BIT=ON -DMULTI_GASES=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | control_wam_debug | - noaacloud hercules | baseline |
Expand Down