-
Notifications
You must be signed in to change notification settings - Fork 161
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
Changes to build system to allow proper linking/control by JEDI system #201
Closed
Closed
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
ca1b9a4
updated CMakeLists.txt
mark-a-potts f27e6b3
Changes for JEDI linking/control
mark-a-potts 45f1be3
Merge branch 'develop' into jedi-ufs
mark-a-potts 8fb4158
changed nceppost to upp
mark-a-potts b6957d8
Fix to allow quilting with non-factors for layout (#192)
chan-hoo fd668c4
Update develop from gsd/develop 2020/11/20: Unified gravity wave drag…
climbfuji a898cca
Fix for updating stochastic physics on separate time-step. (#199)
pjpegion d10e450
Bug fixes in (1) running with frac_grid=T and GFDL MP and (2) restart…
ShanSunNOAA d5944a1
cherry picked merge
mark-a-potts f6b0885
Merge branch 'jedi-ufs' of github.com:mark-a-potts/fv3atm into HEAD
mark-a-potts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -100,7 +100,7 @@ module atmos_model_mod | |
use IPD_driver, only: IPD_initialize, IPD_initialize_rst | ||
use CCPP_driver, only: CCPP_step, non_uniform_blocks | ||
|
||
use stochastic_physics_wrapper_mod, only: stochastic_physics_wrapper | ||
use stochastic_physics_wrapper_mod, only: stochastic_physics_wrapper,stochastic_physics_wrapper_end | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This as well. |
||
#else | ||
use IPD_driver, only: IPD_initialize, IPD_initialize_rst, IPD_step | ||
use physics_abstraction_layer, only: time_vary_step, radiation_step1, physics_step1, physics_step2 | ||
|
@@ -962,6 +962,9 @@ subroutine atmos_model_end (Atmos) | |
!---- termination routine for atmospheric model ---- | ||
|
||
call atmosphere_end (Atmos % Time, Atmos%grid, restart_endfcst) | ||
|
||
call stochastic_physics_wrapper_end(IPD_Control) | ||
|
||
if(restart_endfcst) then | ||
call FV3GFS_restart_write (IPD_Data, IPD_Restart, Atm_block, & | ||
IPD_Control, Atmos%domain) | ||
|
@@ -1761,7 +1764,6 @@ subroutine assign_importdata(rc) | |
nb = Atm_block%blkno(i,j) | ||
ix = Atm_block%ixp(i,j) | ||
|
||
IPD_Data(nb)%Sfcprop%fice(ix) = zero | ||
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = IPD_Data(nb)%Sfcprop%slmsk(ix) | ||
ofrac = IPD_Data(nb)%Sfcprop%oceanfrac(ix) | ||
if (ofrac > zero) then | ||
|
@@ -1776,7 +1778,7 @@ subroutine assign_importdata(rc) | |
if (abs(one-ofrac) < epsln) then | ||
IPD_Data(nb)%Sfcprop%slmsk(ix) = zero | ||
IPD_Data(nb)%Coupling%slimskin_cpl(ix) = zero | ||
end if | ||
endif | ||
endif | ||
endif | ||
enddo | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule physics
updated
35 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<suite name="FV3_GFS_v16beta_coupled" version="1"> | ||
<!-- <init></init> --> | ||
<group name="fast_physics"> | ||
<subcycle loop="1"> | ||
<scheme>fv_sat_adj</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="time_vary"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_time_vary_pre</scheme> | ||
<scheme>GFS_rrtmg_setup</scheme> | ||
<scheme>GFS_rad_time_vary</scheme> | ||
<scheme>GFS_phys_time_vary</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="radiation"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_rad_reset</scheme> | ||
<scheme>GFS_rrtmg_pre</scheme> | ||
<scheme>rrtmg_sw_pre</scheme> | ||
<scheme>rrtmg_sw</scheme> | ||
<scheme>rrtmg_sw_post</scheme> | ||
<scheme>rrtmg_lw_pre</scheme> | ||
<scheme>rrtmg_lw</scheme> | ||
<scheme>rrtmg_lw_post</scheme> | ||
<scheme>GFS_rrtmg_post</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="physics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
<scheme>GFS_suite_stateout_reset</scheme> | ||
<scheme>get_prs_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_1</scheme> | ||
<scheme>GFS_surface_generic_pre</scheme> | ||
<scheme>GFS_surface_composites_pre</scheme> | ||
<scheme>dcyc2t3</scheme> | ||
<scheme>GFS_surface_composites_inter</scheme> | ||
<scheme>GFS_suite_interstitial_2</scheme> | ||
</subcycle> | ||
<!-- Surface iteration loop --> | ||
<subcycle loop="2"> | ||
<scheme>sfc_diff</scheme> | ||
<scheme>GFS_surface_loop_control_part1</scheme> | ||
<scheme>sfc_ocean</scheme> | ||
<scheme>lsm_noah</scheme> | ||
<scheme>sfc_cice</scheme> | ||
<scheme>sfc_sice</scheme> | ||
<scheme>GFS_surface_loop_control_part2</scheme> | ||
</subcycle> | ||
<!-- End of surface iteration loop --> | ||
<subcycle loop="1"> | ||
<scheme>GFS_surface_composites_post</scheme> | ||
<scheme>sfc_diag</scheme> | ||
<scheme>sfc_diag_post</scheme> | ||
<scheme>GFS_surface_generic_post</scheme> | ||
<scheme>GFS_PBL_generic_pre</scheme> | ||
<scheme>satmedmfvdifq</scheme> | ||
<scheme>GFS_PBL_generic_post</scheme> | ||
<scheme>GFS_GWD_generic_pre</scheme> | ||
<scheme>cires_ugwp</scheme> | ||
<scheme>cires_ugwp_post</scheme> | ||
<scheme>GFS_GWD_generic_post</scheme> | ||
<scheme>rayleigh_damp</scheme> | ||
<scheme>GFS_suite_stateout_update</scheme> | ||
<scheme>ozphys_2015</scheme> | ||
<scheme>h2ophys</scheme> | ||
<scheme>get_phi_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_3</scheme> | ||
<scheme>GFS_DCNV_generic_pre</scheme> | ||
<scheme>samfdeepcnv</scheme> | ||
<scheme>GFS_DCNV_generic_post</scheme> | ||
<scheme>GFS_SCNV_generic_pre</scheme> | ||
<scheme>samfshalcnv</scheme> | ||
<scheme>GFS_SCNV_generic_post</scheme> | ||
<scheme>GFS_suite_interstitial_4</scheme> | ||
<scheme>cnvc90</scheme> | ||
<scheme>GFS_MP_generic_pre</scheme> | ||
<scheme>gfdl_cloud_microphys</scheme> | ||
<scheme>GFS_MP_generic_post</scheme> | ||
<scheme>maximum_hourly_diagnostics</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="stochastics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_stochastics</scheme> | ||
<scheme>phys_tend</scheme> | ||
</subcycle> | ||
</group> | ||
<!-- <finalize></finalize> --> | ||
</suite> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,93 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<suite name="FV3_GSD_v0_unified_ugwp_suite" version="1"> | ||
<!-- <init></init> --> | ||
<group name="time_vary"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_time_vary_pre</scheme> | ||
<scheme>GFS_rrtmg_setup</scheme> | ||
<scheme>GFS_rad_time_vary</scheme> | ||
<scheme>GFS_phys_time_vary</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="radiation"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_rad_reset</scheme> | ||
<scheme>sgscloud_radpre</scheme> | ||
<scheme>GFS_rrtmg_pre</scheme> | ||
<scheme>rrtmg_sw_pre</scheme> | ||
<scheme>rrtmg_sw</scheme> | ||
<scheme>rrtmg_sw_post</scheme> | ||
<scheme>rrtmg_lw_pre</scheme> | ||
<scheme>rrtmg_lw</scheme> | ||
<scheme>sgscloud_radpost</scheme> | ||
<scheme>rrtmg_lw_post</scheme> | ||
<scheme>GFS_rrtmg_post</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="physics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
<scheme>GFS_suite_stateout_reset</scheme> | ||
<scheme>get_prs_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_1</scheme> | ||
<scheme>GFS_surface_generic_pre</scheme> | ||
<scheme>GFS_surface_composites_pre</scheme> | ||
<scheme>dcyc2t3</scheme> | ||
<scheme>GFS_surface_composites_inter</scheme> | ||
<scheme>GFS_suite_interstitial_2</scheme> | ||
</subcycle> | ||
<!-- Surface iteration loop --> | ||
<subcycle loop="2"> | ||
<scheme>sfc_diff</scheme> | ||
<scheme>GFS_surface_loop_control_part1</scheme> | ||
<scheme>sfc_nst_pre</scheme> | ||
<scheme>sfc_nst</scheme> | ||
<scheme>sfc_nst_post</scheme> | ||
<scheme>lsm_ruc</scheme> | ||
<scheme>lsm_ruc_sfc_sice_pre</scheme> | ||
<scheme>sfc_sice</scheme> | ||
<scheme>lsm_ruc_sfc_sice_post</scheme> | ||
<scheme>GFS_surface_loop_control_part2</scheme> | ||
</subcycle> | ||
<!-- End of surface iteration loop --> | ||
<subcycle loop="1"> | ||
<scheme>GFS_surface_composites_post</scheme> | ||
<scheme>sfc_diag</scheme> | ||
<scheme>sfc_diag_post</scheme> | ||
<scheme>GFS_surface_generic_post</scheme> | ||
<scheme>mynnedmf_wrapper</scheme> | ||
<scheme>GFS_GWD_generic_pre</scheme> | ||
<scheme>unified_ugwp</scheme> | ||
<scheme>unified_ugwp_post</scheme> | ||
<scheme>GFS_GWD_generic_post</scheme> | ||
<scheme>rayleigh_damp</scheme> | ||
<scheme>GFS_suite_stateout_update</scheme> | ||
<scheme>ozphys_2015</scheme> | ||
<scheme>h2ophys</scheme> | ||
<scheme>get_phi_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_3</scheme> | ||
<scheme>GFS_DCNV_generic_pre</scheme> | ||
<scheme>cu_gf_driver_pre</scheme> | ||
<scheme>cu_gf_driver</scheme> | ||
<scheme>GFS_DCNV_generic_post</scheme> | ||
<scheme>GFS_SCNV_generic_pre</scheme> | ||
<scheme>GFS_SCNV_generic_post</scheme> | ||
<scheme>GFS_suite_interstitial_4</scheme> | ||
<scheme>cnvc90</scheme> | ||
<scheme>GFS_MP_generic_pre</scheme> | ||
<scheme>mp_thompson_pre</scheme> | ||
<scheme>mp_thompson</scheme> | ||
<scheme>mp_thompson_post</scheme> | ||
<scheme>GFS_MP_generic_post</scheme> | ||
<scheme>cu_gf_driver_post</scheme> | ||
<scheme>maximum_hourly_diagnostics</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="stochastics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_stochastics</scheme> | ||
</subcycle> | ||
</group> | ||
<!-- <finalize></finalize> --> | ||
</suite> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,91 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
|
||
<suite name="FV3_GSD_v0_unified_ugwp_suite_noah" version="1"> | ||
<!-- <init></init> --> | ||
<group name="time_vary"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_time_vary_pre</scheme> | ||
<scheme>GFS_rrtmg_setup</scheme> | ||
<scheme>GFS_rad_time_vary</scheme> | ||
<scheme>GFS_phys_time_vary</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="radiation"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_rad_reset</scheme> | ||
<scheme>sgscloud_radpre</scheme> | ||
<scheme>GFS_rrtmg_pre</scheme> | ||
<scheme>rrtmg_sw_pre</scheme> | ||
<scheme>rrtmg_sw</scheme> | ||
<scheme>rrtmg_sw_post</scheme> | ||
<scheme>rrtmg_lw_pre</scheme> | ||
<scheme>rrtmg_lw</scheme> | ||
<scheme>sgscloud_radpost</scheme> | ||
<scheme>rrtmg_lw_post</scheme> | ||
<scheme>GFS_rrtmg_post</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="physics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_suite_interstitial_phys_reset</scheme> | ||
<scheme>GFS_suite_stateout_reset</scheme> | ||
<scheme>get_prs_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_1</scheme> | ||
<scheme>GFS_surface_generic_pre</scheme> | ||
<scheme>GFS_surface_composites_pre</scheme> | ||
<scheme>dcyc2t3</scheme> | ||
<scheme>GFS_surface_composites_inter</scheme> | ||
<scheme>GFS_suite_interstitial_2</scheme> | ||
</subcycle> | ||
<!-- Surface iteration loop --> | ||
<subcycle loop="2"> | ||
<scheme>sfc_diff</scheme> | ||
<scheme>GFS_surface_loop_control_part1</scheme> | ||
<scheme>sfc_nst_pre</scheme> | ||
<scheme>sfc_nst</scheme> | ||
<scheme>sfc_nst_post</scheme> | ||
<scheme>lsm_noah</scheme> | ||
<scheme>sfc_sice</scheme> | ||
<scheme>GFS_surface_loop_control_part2</scheme> | ||
</subcycle> | ||
<!-- End of surface iteration loop --> | ||
<subcycle loop="1"> | ||
<scheme>GFS_surface_composites_post</scheme> | ||
<scheme>sfc_diag</scheme> | ||
<scheme>sfc_diag_post</scheme> | ||
<scheme>GFS_surface_generic_post</scheme> | ||
<scheme>mynnedmf_wrapper</scheme> | ||
<scheme>GFS_GWD_generic_pre</scheme> | ||
<scheme>unified_ugwp</scheme> | ||
<scheme>unified_ugwp_post</scheme> | ||
<scheme>GFS_GWD_generic_post</scheme> | ||
<scheme>rayleigh_damp</scheme> | ||
<scheme>GFS_suite_stateout_update</scheme> | ||
<scheme>ozphys_2015</scheme> | ||
<scheme>h2ophys</scheme> | ||
<scheme>get_phi_fv3</scheme> | ||
<scheme>GFS_suite_interstitial_3</scheme> | ||
<scheme>GFS_DCNV_generic_pre</scheme> | ||
<scheme>cu_gf_driver_pre</scheme> | ||
<scheme>cu_gf_driver</scheme> | ||
<scheme>GFS_DCNV_generic_post</scheme> | ||
<scheme>GFS_SCNV_generic_pre</scheme> | ||
<scheme>GFS_SCNV_generic_post</scheme> | ||
<scheme>GFS_suite_interstitial_4</scheme> | ||
<scheme>cnvc90</scheme> | ||
<scheme>GFS_MP_generic_pre</scheme> | ||
<scheme>mp_thompson_pre</scheme> | ||
<scheme>mp_thompson</scheme> | ||
<scheme>mp_thompson_post</scheme> | ||
<scheme>GFS_MP_generic_post</scheme> | ||
<scheme>cu_gf_driver_post</scheme> | ||
<scheme>maximum_hourly_diagnostics</scheme> | ||
</subcycle> | ||
</group> | ||
<group name="stochastics"> | ||
<subcycle loop="1"> | ||
<scheme>GFS_stochastics</scheme> | ||
</subcycle> | ||
</group> | ||
<!-- <finalize></finalize> --> | ||
</suite> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change (everything related to
_ccpp_debug_arg
) was merged into develop a few weeks back, see https://github.com/NOAA-EMC/fv3atm/blob/develop/CMakeLists.txt. Why is it showing up here again?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't know why the files show up here again, but when comparing directly to origin/develop using git, there is only a change to the CMakeLists.txt file that changes the ccppphysics link to PUBLIC.