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

UFS/dev PR#34 (RRTMGP refactoring) #367

Merged
merged 1 commit into from
Mar 14, 2023
Merged

UFS/dev PR#34 (RRTMGP refactoring) #367

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
40 changes: 3 additions & 37 deletions ccpp/config/ccpp_prebuild_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
'ccpp/physics/physics/h2o_def.f',
'ccpp/physics/physics/ozne_def.f',
'ccpp/physics/physics/radiation_surface.f',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
'ccpp/physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
'ccpp/physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
'ccpp/physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
'scm/src/CCPP_typedefs.F90',
'scm/src/GFS_typedefs.F90',
'scm/src/scm_kinds.F90',
Expand Down Expand Up @@ -73,27 +68,6 @@
'scm_type_defs' : '',
'physics_type' : 'physics',
},
'mo_gas_concentrations' : {
'ty_gas_concs' : '',
'mo_gas_concentrations' : '',
},
'mo_gas_optics_rrtmgp' : {
'ty_gas_optics_rrtmgp' : '',
'mo_gas_optics_rrtmgp' : '',
},
'mo_optical_props' : {
'ty_optical_props_1scl' : '',
'ty_optical_props_2str' : '',
'mo_optical_props' : '',
},
'mo_cloud_optics' : {
'ty_cloud_optics' : '',
'mo_cloud_optics' : '',
},
'mo_source_functions' : {
'ty_source_func_lw' : '',
'mo_source_functions' : '',
},
}

# Add all physics scheme files relative to basedir
Expand Down Expand Up @@ -221,23 +195,15 @@
'ccpp/physics/smoke/rrfs_smoke_lsdep_wrapper.F90' ,
'ccpp/physics/physics/scm_sfc_flux_spec.F90' ,
# RRTMGP
'ccpp/physics/physics/rrtmgp_lw_gas_optics.F90' ,
'ccpp/physics/physics/rrtmgp_lw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_sw_gas_optics.F90' ,
'ccpp/physics/physics/rrtmgp_sw_cloud_optics.F90' ,
'ccpp/physics/physics/rrtmgp_aerosol_optics.F90' ,
'ccpp/physics/physics/rrtmgp_lw_rte.F90' ,
'ccpp/physics/physics/rrtmgp_sw_rte.F90' ,
'ccpp/physics/physics/rrtmgp_lw_main.F90' ,
'ccpp/physics/physics/rrtmgp_sw_main.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_setup.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_pre.F90' ,
'ccpp/physics/physics/rrtmgp_lw_pre.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_lw_post.F90' ,
'ccpp/physics/physics/rrtmgp_lw_cloud_sampling.F90' ,
'ccpp/physics/physics/rrtmgp_sw_cloud_sampling.F90' ,
'ccpp/physics/physics/GFS_cloud_diagnostics.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_cloud_mp.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_cloud_overlap.F90' ,
'ccpp/physics/physics/GFS_rrtmgp_sw_post.F90'
'ccpp/physics/physics/GFS_rrtmgp_post.F90'
]

# Default build dir, relative to current working directory,
Expand Down
2 changes: 1 addition & 1 deletion ccpp/framework
Open in desktop
Submodule framework updated 4 files
+5 −5 scripts/ccpp_state_machine.py
+3 −0 scripts/common.py
+3 −3 scripts/state_machine.py
+52 −0 test/unit_tests/test_common.py
2 changes: 1 addition & 1 deletion ccpp/physics
Open in desktop
Submodule physics updated 40 files
+1 −1 .gitmodules
+0 −12 CMakeLists.txt
+25 −23 physics/GFS_rrtmgp_cloud_mp.F90
+3 −3 physics/GFS_rrtmgp_cloud_mp.meta
+0 −188 physics/GFS_rrtmgp_lw_post.F90
+0 −253 physics/GFS_rrtmgp_lw_post.meta
+394 −0 physics/GFS_rrtmgp_post.F90
+157 −34 physics/GFS_rrtmgp_post.meta
+86 −57 physics/GFS_rrtmgp_pre.F90
+80 −56 physics/GFS_rrtmgp_pre.meta
+3 −3 physics/GFS_rrtmgp_setup.F90
+1 −1 physics/GFS_rrtmgp_setup.meta
+0 −286 physics/GFS_rrtmgp_sw_post.F90
+0 −95 physics/GFS_rrtmgp_sw_pre.F90
+0 −124 physics/GFS_rrtmgp_sw_pre.meta
+26 −38 physics/rrtmgp_aerosol_optics.F90
+50 −30 physics/rrtmgp_aerosol_optics.meta
+18 −200 physics/rrtmgp_lw_cloud_optics.F90
+0 −412 physics/rrtmgp_lw_cloud_optics.meta
+0 −170 physics/rrtmgp_lw_cloud_sampling.F90
+0 −226 physics/rrtmgp_lw_cloud_sampling.meta
+13 −108 physics/rrtmgp_lw_gas_optics.F90
+0 −203 physics/rrtmgp_lw_gas_optics.meta
+611 −0 physics/rrtmgp_lw_main.F90
+641 −0 physics/rrtmgp_lw_main.meta
+0 −61 physics/rrtmgp_lw_pre.F90
+0 −47 physics/rrtmgp_lw_pre.meta
+0 −208 physics/rrtmgp_lw_rte.F90
+0 −208 physics/rrtmgp_lw_rte.meta
+21 −223 physics/rrtmgp_sw_cloud_optics.F90
+0 −393 physics/rrtmgp_sw_cloud_optics.meta
+0 −174 physics/rrtmgp_sw_cloud_sampling.F90
+0 −240 physics/rrtmgp_sw_cloud_sampling.meta
+11 −126 physics/rrtmgp_sw_gas_optics.F90
+0 −201 physics/rrtmgp_sw_gas_optics.meta
+683 −0 physics/rrtmgp_sw_main.F90
+664 −0 physics/rrtmgp_sw_main.meta
+0 −219 physics/rrtmgp_sw_rte.F90
+0 −240 physics/rrtmgp_sw_rte.meta
+1 −1 physics/rte-rrtmgp
15 changes: 3 additions & 12 deletions ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,10 @@
<scheme>GFS_rrtmgp_cloud_mp</scheme>
<scheme>GFS_rrtmgp_cloud_overlap</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmgp_aerosol_optics</scheme>
<scheme>rrtmgp_sw_gas_optics</scheme>
<scheme>rrtmgp_sw_cloud_optics</scheme>
<scheme>rrtmgp_sw_cloud_sampling</scheme>
<scheme>rrtmgp_sw_rte</scheme>
<scheme>GFS_rrtmgp_sw_post</scheme>
<scheme>rrtmgp_lw_pre</scheme>
<scheme>rrtmgp_lw_gas_optics</scheme>
<scheme>rrtmgp_lw_cloud_optics</scheme>
<scheme>rrtmgp_lw_cloud_sampling</scheme>
<scheme>rrtmgp_lw_rte</scheme>
<scheme>GFS_rrtmgp_lw_post</scheme>
<scheme>rrtmgp_sw_main</scheme>
<scheme>rrtmgp_lw_main</scheme>
<scheme>GFS_rrtmgp_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
15 changes: 3 additions & 12 deletions ccpp/suites/suite_SCM_GFS_v15p2_RRTMGP_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,10 @@
<scheme>GFS_rrtmgp_cloud_mp</scheme>
<scheme>GFS_rrtmgp_cloud_overlap</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmgp_aerosol_optics</scheme>
<scheme>rrtmgp_sw_gas_optics</scheme>
<scheme>rrtmgp_sw_cloud_optics</scheme>
<scheme>rrtmgp_sw_cloud_sampling</scheme>
<scheme>rrtmgp_sw_rte</scheme>
<scheme>GFS_rrtmgp_sw_post</scheme>
<scheme>rrtmgp_lw_pre</scheme>
<scheme>rrtmgp_lw_gas_optics</scheme>
<scheme>rrtmgp_lw_cloud_optics</scheme>
<scheme>rrtmgp_lw_cloud_sampling</scheme>
<scheme>rrtmgp_lw_rte</scheme>
<scheme>GFS_rrtmgp_lw_post</scheme>
<scheme>rrtmgp_sw_main</scheme>
<scheme>rrtmgp_lw_main</scheme>
<scheme>GFS_rrtmgp_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
15 changes: 3 additions & 12 deletions ccpp/suites/suite_SCM_GFS_v16_RRTMGP.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,10 @@
<scheme>GFS_rrtmgp_cloud_mp</scheme>
<scheme>GFS_rrtmgp_cloud_overlap</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmgp_aerosol_optics</scheme>
<scheme>rrtmgp_sw_gas_optics</scheme>
<scheme>rrtmgp_sw_cloud_optics</scheme>
<scheme>rrtmgp_sw_cloud_sampling</scheme>
<scheme>rrtmgp_sw_rte</scheme>
<scheme>GFS_rrtmgp_sw_post</scheme>
<scheme>rrtmgp_lw_pre</scheme>
<scheme>rrtmgp_lw_gas_optics</scheme>
<scheme>rrtmgp_lw_cloud_optics</scheme>
<scheme>rrtmgp_lw_cloud_sampling</scheme>
<scheme>rrtmgp_lw_rte</scheme>
<scheme>GFS_rrtmgp_lw_post</scheme>
<scheme>rrtmgp_sw_main</scheme>
<scheme>rrtmgp_lw_main</scheme>
<scheme>GFS_rrtmgp_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
15 changes: 3 additions & 12 deletions ccpp/suites/suite_SCM_GFS_v16_RRTMGP_ps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,10 @@
<scheme>GFS_rrtmgp_cloud_mp</scheme>
<scheme>GFS_rrtmgp_cloud_overlap</scheme>
<scheme>GFS_cloud_diagnostics</scheme>
<scheme>rad_sw_pre</scheme>
<scheme>rrtmgp_aerosol_optics</scheme>
<scheme>rrtmgp_sw_gas_optics</scheme>
<scheme>rrtmgp_sw_cloud_optics</scheme>
<scheme>rrtmgp_sw_cloud_sampling</scheme>
<scheme>rrtmgp_sw_rte</scheme>
<scheme>GFS_rrtmgp_sw_post</scheme>
<scheme>rrtmgp_lw_pre</scheme>
<scheme>rrtmgp_lw_gas_optics</scheme>
<scheme>rrtmgp_lw_cloud_optics</scheme>
<scheme>rrtmgp_lw_cloud_sampling</scheme>
<scheme>rrtmgp_lw_rte</scheme>
<scheme>GFS_rrtmgp_lw_post</scheme>
<scheme>rrtmgp_sw_main</scheme>
<scheme>rrtmgp_lw_main</scheme>
<scheme>GFS_rrtmgp_post</scheme>
</subcycle>
</group>
<group name="physics">
Expand Down
Loading