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

release/public-v2: replace RRFS v1 beta suite with RRFS v1 alpha suite, add guard for Thompson MP and effr_in #207

Merged
merged 3 commits into from
Dec 3, 2020
Merged

release/public-v2: replace RRFS v1 beta suite with RRFS v1 alpha suite, add guard for Thompson MP and effr_in #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3fb6e1
Add guard to gfsphysics/GFS_layer/GFS_typedefs.F90 to prevent running…
climbfuji Dec 2, 2020
4c7e365
Update .gitmodules and submodule pointer for GFDL_atmos_cubed_sphere …
climbfuji Dec 2, 2020
60e0fbc
Revert change to .gitmodules and update submodule pointer for GFDL_at…
climbfuji Dec 3, 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
2 changes: 1 addition & 1 deletion atmos_cubed_sphere
Open in desktop
Submodule atmos_cubed_sphere updated 1 files
+1 −1 model/fv_regional_bc.F90
2 changes: 1 addition & 1 deletion ccpp/suites/suite_FV3_RRFS_v1alpha.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<scheme>sfc_nst_pre</scheme>
<scheme>sfc_nst</scheme>
<scheme>sfc_nst_post</scheme>
<scheme>lsm_noah</scheme>
<scheme>noahmpdrv</scheme>
<scheme>sfc_sice</scheme>
<scheme>GFS_surface_loop_control_part2</scheme>
</subcycle>
Expand Down
83 changes: 0 additions & 83 deletions ccpp/suites/suite_FV3_RRFS_v1beta.xml
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions gfsphysics/GFS_layer/GFS_typedefs.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4583,6 +4583,10 @@ subroutine control_initialize (Model, nlunit, fn_nml, me, master, &
Model%nleffr = 1
Model%nieffr = 2
Model%nseffr = 3
if (.not. Model%effr_in) then
print *,' Thompson MP requires effr_in to be set to .true. - job aborted'
stop
end if
if (Model%me == Model%master) print *,' Using Thompson double moment', &
' microphysics',' ltaerosol = ',Model%ltaerosol, &
' ttendlim =',Model%ttendlim, &
Expand Down