diff --git a/.gitmodules b/.gitmodules index dc0798c32..6e979209b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,7 +4,7 @@ branch = main [submodule "ccpp-physics"] path = ccpp/physics - url = https://github.com/NCAR/ccpp-physics + url = https://github.com/NCAR/ccpp-physics branch = main [submodule "CMakeModules"] path = CMakeModules diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py index 2eeac4201..d86710b97 100755 --- a/ccpp/config/ccpp_prebuild_config.py +++ b/ccpp/config/ccpp_prebuild_config.py @@ -16,13 +16,12 @@ VARIABLE_DEFINITION_FILES = [ # actual variable definition files 'ccpp/framework/src/ccpp_types.F90', - 'ccpp/physics/physics/machine.F', - 'ccpp/physics/physics/radsw_param.f', - 'ccpp/physics/physics/radlw_param.f', - 'ccpp/physics/physics/h2o_def.f', - 'ccpp/physics/physics/radiation_surface.f', - 'ccpp/physics/physics/module_ozphys.F90', - 'ccpp/physics/physics/module_ccpp_suite_simulator.F90', + 'ccpp/physics/physics/hooks/machine.F', + 'ccpp/physics/physics/Radiation/RRTMG/radsw_param.f', + 'ccpp/physics/physics/Radiation/RRTMG/radlw_param.f', + 'ccpp/physics/physics/photochem/h2o_def.f', + 'ccpp/physics/physics/photochem/module_ozphys.F90', + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/module_ccpp_suite_simulator.F90', 'scm/src/CCPP_typedefs.F90', 'scm/src/GFS_typedefs.F90', 'scm/src/scm_kinds.F90', @@ -84,139 +83,137 @@ # Relative path to source (from where ccpp_prebuild.py is called) : [ list of physics sets in which scheme may be called ]; # current restrictions are that each scheme can only belong to one physics set, and all schemes within one group in the # suite definition file have to belong to the same physics set - 'ccpp/physics/physics/GFS_DCNV_generic_pre.F90' , - 'ccpp/physics/physics/GFS_DCNV_generic_post.F90' , - 'ccpp/physics/physics/GFS_GWD_generic_pre.F90' , - 'ccpp/physics/physics/GFS_GWD_generic_post.F90' , - 'ccpp/physics/physics/GFS_MP_generic_pre.F90' , - 'ccpp/physics/physics/GFS_MP_generic_post.F90' , - 'ccpp/physics/physics/GFS_PBL_generic_pre.F90' , - 'ccpp/physics/physics/GFS_PBL_generic_post.F90' , - 'ccpp/physics/physics/GFS_SCNV_generic_pre.F90' , - 'ccpp/physics/physics/GFS_SCNV_generic_post.F90' , - 'ccpp/physics/physics/GFS_phys_time_vary.scm.F90' , - 'ccpp/physics/physics/GFS_rad_time_vary.scm.F90' , - 'ccpp/physics/physics/GFS_radiation_surface.F90' , - 'ccpp/physics/physics/GFS_rrtmg_post.F90' , - 'ccpp/physics/physics/GFS_rrtmg_pre.F90' , - 'ccpp/physics/physics/GFS_rrtmg_setup.F90' , - 'ccpp/physics/physics/GFS_suite_interstitial_rad_reset.F90', - 'ccpp/physics/physics/GFS_suite_interstitial_phys_reset.F90', - 'ccpp/physics/physics/GFS_suite_interstitial_1.F90' , - 'ccpp/physics/physics/GFS_suite_interstitial_2.F90' , - 'ccpp/physics/physics/GFS_suite_stateout_reset.F90' , - 'ccpp/physics/physics/GFS_suite_stateout_update.F90' , - 'ccpp/physics/physics/GFS_suite_interstitial_3.F90' , - 'ccpp/physics/physics/GFS_suite_interstitial_4.F90' , - 'ccpp/physics/physics/GFS_suite_interstitial_5.F90' , - 'ccpp/physics/physics/GFS_surface_generic_pre.F90' , - 'ccpp/physics/physics/GFS_surface_generic_post.F90' , - 'ccpp/physics/physics/GFS_surface_composites_pre.F90' , - 'ccpp/physics/physics/GFS_surface_composites_inter.F90' , - 'ccpp/physics/physics/GFS_surface_composites_post.F90' , - 'ccpp/physics/physics/GFS_surface_loop_control_part1.F90' , - 'ccpp/physics/physics/GFS_surface_loop_control_part2.F90' , - 'ccpp/physics/physics/GFS_time_vary_pre.scm.F90' , - 'ccpp/physics/physics/GFS_physics_post.F90', + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90', + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90', + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.f' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90' , + 'ccpp/physics/physics/Interstitials/UFS_SCM_NEPTUNE/ccpp_suite_simulator.F90' , # 'ccpp/physics/physics/bl_acm.F90' , - 'ccpp/physics/physics/cires_ugwp.F90' , - 'ccpp/physics/physics/cires_ugwp_post.F90' , - 'ccpp/physics/physics/unified_ugwp.F90' , - 'ccpp/physics/physics/unified_ugwp_post.F90' , - 'ccpp/physics/physics/ugwpv1_gsldrag.F90' , - 'ccpp/physics/physics/ugwpv1_gsldrag_post.F90' , - 'ccpp/physics/physics/cnvc90.f' , - 'ccpp/physics/physics/cs_conv_pre.F90' , - 'ccpp/physics/physics/cs_conv.F90' , - 'ccpp/physics/physics/cs_conv_post.F90' , - 'ccpp/physics/physics/cs_conv_aw_adj.F90' , - 'ccpp/physics/physics/cu_ntiedtke_pre.F90' , - 'ccpp/physics/physics/cu_ntiedtke.F90' , - 'ccpp/physics/physics/cu_ntiedtke_post.F90' , - 'ccpp/physics/physics/dcyc2t3.f' , - 'ccpp/physics/physics/drag_suite.F90' , - 'ccpp/physics/physics/shoc.F90' , - 'ccpp/physics/physics/get_prs_fv3.F90' , - 'ccpp/physics/physics/get_phi_fv3.F90' , - 'ccpp/physics/physics/gfdl_cloud_microphys.F90' , - 'ccpp/physics/physics/gfdl_sfc_layer.F90' , - 'ccpp/physics/physics/zhaocarr_gscond.f' , - 'ccpp/physics/physics/gwdc_pre.f' , - 'ccpp/physics/physics/gwdc.f' , - 'ccpp/physics/physics/gwdc_post.f' , - 'ccpp/physics/physics/gwdps.f' , - 'ccpp/physics/physics/h2ophys.f' , - 'ccpp/physics/physics/samfdeepcnv.f' , - 'ccpp/physics/physics/samfshalcnv.f' , - 'ccpp/physics/physics/sascnvn.F' , - 'ccpp/physics/physics/shalcnv.F' , - 'ccpp/physics/physics/maximum_hourly_diagnostics.F90' , - 'ccpp/physics/physics/m_micro.F90' , - 'ccpp/physics/physics/m_micro_pre.F90' , - 'ccpp/physics/physics/m_micro_post.F90' , - 'ccpp/physics/physics/cu_gf_driver_pre.F90' , - 'ccpp/physics/physics/cu_gf_driver.F90' , - 'ccpp/physics/physics/cu_gf_driver_post.F90' , - 'ccpp/physics/physics/cu_c3_driver_pre.F90' , - 'ccpp/physics/physics/cu_c3_driver.F90' , - 'ccpp/physics/physics/cu_c3_driver_post.F90' , - 'ccpp/physics/physics/hedmf.f' , - 'ccpp/physics/physics/moninshoc.f' , - 'ccpp/physics/physics/satmedmfvdif.F' , - 'ccpp/physics/physics/satmedmfvdifq.F' , - 'ccpp/physics/physics/shinhongvdif.F90' , - 'ccpp/physics/physics/ysuvdif.F90' , - 'ccpp/physics/physics/mynnedmf_wrapper.F90' , - 'ccpp/physics/physics/mynnsfc_wrapper.F90' , - 'ccpp/physics/physics/sgscloud_radpre.F90' , - 'ccpp/physics/physics/sgscloud_radpost.F90' , - 'ccpp/physics/physics/myjsfc_wrapper.F90' , - 'ccpp/physics/physics/myjpbl_wrapper.F90' , - 'ccpp/physics/physics/mp_thompson_pre.F90' , - 'ccpp/physics/physics/mp_thompson.F90' , - 'ccpp/physics/physics/mp_thompson_post.F90' , - 'ccpp/physics/physics/mp_nssl.F90' , - 'ccpp/physics/physics/zhaocarr_precpd.f' , - 'ccpp/physics/physics/radlw_main.F90' , - 'ccpp/physics/physics/radsw_main.F90' , - 'ccpp/physics/physics/rascnv.F90' , - 'ccpp/physics/physics/rayleigh_damp.f' , - 'ccpp/physics/physics/rrtmg_lw_post.F90' , - 'ccpp/physics/physics/rrtmg_lw_pre.F90' , - 'ccpp/physics/physics/rrtmg_sw_post.F90' , - 'ccpp/physics/physics/rad_sw_pre.F90' , - 'ccpp/physics/physics/sfc_diag.f' , - 'ccpp/physics/physics/sfc_diag_post.F90' , - 'ccpp/physics/physics/lsm_ruc.F90' , - 'ccpp/physics/physics/sfc_cice.f' , - 'ccpp/physics/physics/sfc_diff.f' , - 'ccpp/physics/physics/lsm_noah.f' , - 'ccpp/physics/physics/noahmpdrv.F90' , - 'ccpp/physics/physics/flake_driver.F90' , - 'ccpp/physics/physics/clm_lake.f90' , - 'ccpp/physics/physics/sfc_nst_pre.f90' , - 'ccpp/physics/physics/sfc_nst.f90' , - 'ccpp/physics/physics/sfc_nst_post.f90' , - 'ccpp/physics/physics/sfc_ocean.F' , - 'ccpp/physics/physics/sfc_sice.f' , - 'ccpp/physics/physics/mp_fer_hires.F90' , - # SMOKE + 'ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_pre.F90', + 'ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv.F90', + 'ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_post.F90', + 'ccpp/physics/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90', + 'ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke_pre.F90', + 'ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke.F90', + 'ccpp/physics/physics/CONV/nTiedtke/cu_ntiedtke_post.F90', + 'ccpp/physics/physics/CONV/SAMF/samfdeepcnv.f', + 'ccpp/physics/physics/CONV/SAMF/samfshalcnv.f', + 'ccpp/physics/physics/CONV/SAS/sascnvn.F', + 'ccpp/physics/physics/CONV/SAS/shalcnv.F', + 'ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90', + 'ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver.F90', + 'ccpp/physics/physics/CONV/Grell_Freitas/cu_gf_driver_post.F90', + 'ccpp/physics/physics/CONV/C3/cu_c3_driver_pre.F90', + 'ccpp/physics/physics/CONV/C3/cu_c3_driver.F90', + 'ccpp/physics/physics/CONV/C3/cu_c3_driver_post.F90', + 'ccpp/physics/physics/CONV/RAS/rascnv.F90', + 'ccpp/physics/physics/GWD/cires_ugwp.F90', + 'ccpp/physics/physics/GWD/cires_ugwp_post.F90', + 'ccpp/physics/physics/GWD/unified_ugwp.F90', + 'ccpp/physics/physics/GWD/unified_ugwp_post.F90', + 'ccpp/physics/physics/GWD/ugwpv1_gsldrag.F90', + 'ccpp/physics/physics/GWD/ugwpv1_gsldrag_post.F90', + 'ccpp/physics/physics/GWD/drag_suite.F90', + 'ccpp/physics/physics/GWD/gwdc_pre.f', + 'ccpp/physics/physics/GWD/gwdc.f', + 'ccpp/physics/physics/GWD/gwdc_post.f', + 'ccpp/physics/physics/GWD/gwdps.f', + 'ccpp/physics/physics/GWD/rayleigh_damp.f', + 'ccpp/physics/physics/photochem/h2ophys.f', + 'ccpp/physics/physics/photochem/module_ozphys.F90', + 'ccpp/physics/physics/MP/Ferrier_Aligo/mp_fer_hires.F90', + 'ccpp/physics/physics/MP/GFDL/gfdl_cloud_microphys.F90', + 'ccpp/physics/physics/MP/GFDL/fv_sat_adj.F90', + 'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro.F90', + 'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro_pre.F90', + 'ccpp/physics/physics/MP/Morrison_Gettelman/m_micro_post.F90', + 'ccpp/physics/physics/MP/NSSL/mp_nssl.F90', + 'ccpp/physics/physics/MP/Thompson/mp_thompson_pre.F90', + 'ccpp/physics/physics/MP/Thompson/mp_thompson.F90', + 'ccpp/physics/physics/MP/Thompson/mp_thompson_post.F90', + 'ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_gscond.f', + 'ccpp/physics/physics/MP/Zhao_Carr/zhaocarr_precpd.f', + 'ccpp/physics/physics/PBL/HEDMF/hedmf.f', + 'ccpp/physics/physics/PBL/SHOC/moninshoc.f', + 'ccpp/physics/physics/PBL/SHOC/shoc.F90', + 'ccpp/physics/physics/PBL/MYJ/myjpbl_wrapper.F90', + 'ccpp/physics/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90', + 'ccpp/physics/physics/PBL/SATMEDMF/satmedmfvdif.F', + 'ccpp/physics/physics/PBL/SATMEDMF/satmedmfvdifq.F', + 'ccpp/physics/physics/PBL/YSU/ysuvdif.F90', + 'ccpp/physics/physics/PBL/saYSU/shinhongvdif.F90', + 'ccpp/physics/physics/Radiation/RRTMG/radsw_main.F90', + 'ccpp/physics/physics/Radiation/RRTMG/radlw_main.F90', + 'ccpp/physics/physics/Radiation/RRTMG/rrtmg_lw_post.F90', + 'ccpp/physics/physics/Radiation/RRTMG/rrtmg_sw_post.F90', + 'ccpp/physics/physics/Radiation/RRTMG/rad_sw_pre.F90', + 'ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.F90', + 'ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90', + 'ccpp/physics/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90', + 'ccpp/physics/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90', + 'ccpp/physics/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90', + 'ccpp/physics/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_diag.f', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_diag_post.F90', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_diff.f', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_nst_pre.f90', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_nst.f90', + 'ccpp/physics/physics/SFC_Layer/UFS/sfc_nst_post.f90', + 'ccpp/physics/physics/SFC_Models/Land/RUC/lsm_ruc.F90', + 'ccpp/physics/physics/SFC_Models/SeaIce/CICE/sfc_cice.f', + 'ccpp/physics/physics/SFC_Models/Land/Noah/lsm_noah.f', + 'ccpp/physics/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90', + 'ccpp/physics/physics/SFC_Models/Lake/Flake/flake_driver.F90', + 'ccpp/physics/physics/SFC_Models/Lake/CLM/clm_lake.f90', + 'ccpp/physics/physics/SFC_Models/Ocean/UFS/sfc_ocean.F', + 'ccpp/physics/physics/SFC_Models/SeaIce/CICE/sfc_sice.f', 'ccpp/physics/physics/smoke_dust/rrfs_smoke_wrapper.F90', 'ccpp/physics/physics/smoke_dust/rrfs_smoke_postpbl.F90', - 'ccpp/physics/physics/scm_sfc_flux_spec.F90' , - # RRTMGP - 'ccpp/physics/physics/rrtmgp_aerosol_optics.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/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_post.F90' , - # CCPP-SCM - 'ccpp/physics/physics/GFS_ccpp_suite_sim_pre.F90' , - 'ccpp/physics/physics/ccpp_suite_simulator.F90' + 'ccpp/physics/physics/tools/get_prs_fv3.F90', + 'ccpp/physics/physics/tools/get_phi_fv3.F90' ] # Default build dir, relative to current working directory, diff --git a/ccpp/physics b/ccpp/physics index ba7ed8f17..7b36320b2 160000 --- a/ccpp/physics +++ b/ccpp/physics @@ -1 +1 @@ -Subproject commit ba7ed8f173b6c91d6180be16051ce0d4c54cb2ad +Subproject commit 7b36320b2f096adb31064959a28e6bcf95e49b60 diff --git a/ccpp/suites/suite_HAFS_v0_hwrf.xml b/ccpp/suites/suite_HAFS_v0_hwrf.xml index e62722aee..c96348cfd 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf.xml @@ -15,7 +15,6 @@ GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post rad_sw_pre diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml index 28f861548..cfae0831a 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_ps.xml @@ -15,7 +15,6 @@ GFS_suite_interstitial_rad_reset GFS_rrtmg_pre GFS_radiation_surface - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post rad_sw_pre diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml index 6aaa99bd4..e59f0ebfe 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson.xml @@ -16,7 +16,6 @@ GFS_rrtmg_pre GFS_radiation_surface - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post rad_sw_pre diff --git a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml index 1ac188a4a..1831f8829 100644 --- a/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml +++ b/ccpp/suites/suite_HAFS_v0_hwrf_thompson_ps.xml @@ -16,7 +16,6 @@ GFS_rrtmg_pre GFS_radiation_surface - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post rad_sw_pre diff --git a/ccpp/suites/suite_SCM_GFS_v15p2.xml b/ccpp/suites/suite_SCM_GFS_v15p2.xml index 277909b6a..087e25d4a 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml index 2ad92db2b..8f6cc0d53 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ACM_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml index 679cdd0b2..19d469bc6 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_FA.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml index 4331a1012..ff52d53dc 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_MYJ.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml index d648c7c7f..f63ab5537 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_YSU_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml index bc946b04a..8fb960315 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml index f94e6f0c6..a409f3edc 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_no_nsst_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml index b4d8ef276..c845c8878 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_noahmp.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml index 361c110d0..9fb1ac66b 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml index 12bd53186..9b3948944 100644 --- a/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v15p2_saYSU_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v16.xml b/ccpp/suites/suite_SCM_GFS_v16.xml index 1d52353db..723dbd910 100644 --- a/ccpp/suites/suite_SCM_GFS_v16.xml +++ b/ccpp/suites/suite_SCM_GFS_v16.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml b/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml index 28120648b..19733a6eb 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_no_nsst.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml index 1717e6d7d..5437699c1 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_no_nsst_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_ps.xml b/ccpp/suites/suite_SCM_GFS_v16_ps.xml index 04bbafe05..6320bf6a6 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_ps.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml b/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml index 68eeea646..0d4ebc861 100644 --- a/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml +++ b/ccpp/suites/suite_SCM_GFS_v16_ugwpv1.xml @@ -17,7 +17,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8.xml b/ccpp/suites/suite_SCM_GFS_v17_p8.xml index 465f85d08..17eb9993b 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml index eb725516d..5105ec520 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_c3.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml index 082879ba6..4a759285c 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_c3_ps.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml index ad25b8459..35c3941a8 100644 --- a/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml +++ b/ccpp/suites/suite_SCM_GFS_v17_p8_ps.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_GSD_v1.xml b/ccpp/suites/suite_SCM_GSD_v1.xml index 4af11e6d1..d7d45d10f 100644 --- a/ccpp/suites/suite_SCM_GSD_v1.xml +++ b/ccpp/suites/suite_SCM_GSD_v1.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_GSD_v1_ps.xml b/ccpp/suites/suite_SCM_GSD_v1_ps.xml index e1eeb4d53..83fa060a2 100644 --- a/ccpp/suites/suite_SCM_GSD_v1_ps.xml +++ b/ccpp/suites/suite_SCM_GSD_v1_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_GSD_v1nssl.xml b/ccpp/suites/suite_SCM_GSD_v1nssl.xml index 29ac89555..fefdc11ad 100644 --- a/ccpp/suites/suite_SCM_GSD_v1nssl.xml +++ b/ccpp/suites/suite_SCM_GSD_v1nssl.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml b/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml index 9b716f5ed..fbf82ce98 100644 --- a/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml +++ b/ccpp/suites/suite_SCM_GSD_v1nssl_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_HRRR.xml b/ccpp/suites/suite_SCM_HRRR.xml index 60354973d..7904da3f3 100644 --- a/ccpp/suites/suite_SCM_HRRR.xml +++ b/ccpp/suites/suite_SCM_HRRR.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_HRRR_ps.xml b/ccpp/suites/suite_SCM_HRRR_ps.xml index 1f2ac8297..e1f930dbf 100644 --- a/ccpp/suites/suite_SCM_HRRR_ps.xml +++ b/ccpp/suites/suite_SCM_HRRR_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RAP.xml b/ccpp/suites/suite_SCM_RAP.xml index fac8381ff..68040872d 100644 --- a/ccpp/suites/suite_SCM_RAP.xml +++ b/ccpp/suites/suite_SCM_RAP.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RAP_ps.xml b/ccpp/suites/suite_SCM_RAP_ps.xml index b8a6077e8..6855b1167 100644 --- a/ccpp/suites/suite_SCM_RAP_ps.xml +++ b/ccpp/suites/suite_SCM_RAP_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RRFS_v1alpha.xml b/ccpp/suites/suite_SCM_RRFS_v1alpha.xml index b86946623..7b0ec9db9 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1alpha.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml index 9aaa11435..f21105dba 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1alpha_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RRFS_v1beta.xml b/ccpp/suites/suite_SCM_RRFS_v1beta.xml index 062751ad9..1921f3f56 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1beta.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml b/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml index 568ae1bcb..4c554c438 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1beta_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_RRFS_v1nssl.xml b/ccpp/suites/suite_SCM_RRFS_v1nssl.xml index 1999949ce..439f34737 100644 --- a/ccpp/suites/suite_SCM_RRFS_v1nssl.xml +++ b/ccpp/suites/suite_SCM_RRFS_v1nssl.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_WoFS_v0.xml b/ccpp/suites/suite_SCM_WoFS_v0.xml index d289c5fc0..a16c8b116 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0.xml +++ b/ccpp/suites/suite_SCM_WoFS_v0.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_WoFS_v0_ps.xml b/ccpp/suites/suite_SCM_WoFS_v0_ps.xml index 3382326e1..3592ac2b5 100644 --- a/ccpp/suites/suite_SCM_WoFS_v0_ps.xml +++ b/ccpp/suites/suite_SCM_WoFS_v0_ps.xml @@ -19,7 +19,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw sgscloud_radpost rrtmg_lw_post diff --git a/ccpp/suites/suite_SCM_csawmg.xml b/ccpp/suites/suite_SCM_csawmg.xml index d467f2134..61e856774 100644 --- a/ccpp/suites/suite_SCM_csawmg.xml +++ b/ccpp/suites/suite_SCM_csawmg.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/ccpp/suites/suite_SCM_csawmg_ps.xml b/ccpp/suites/suite_SCM_csawmg_ps.xml index af42102ce..c7ccf9963 100644 --- a/ccpp/suites/suite_SCM_csawmg_ps.xml +++ b/ccpp/suites/suite_SCM_csawmg_ps.xml @@ -18,7 +18,6 @@ rad_sw_pre rrtmg_sw rrtmg_sw_post - rrtmg_lw_pre rrtmg_lw rrtmg_lw_post GFS_rrtmg_post diff --git a/scm/src/CCPP_typedefs.meta b/scm/src/CCPP_typedefs.meta index f706f2a45..8ab9f4ba2 100644 --- a/scm/src/CCPP_typedefs.meta +++ b/scm/src/CCPP_typedefs.meta @@ -2859,11 +2859,8 @@ name = CCPP_typedefs type = module relative_path = ../../ccpp/physics/physics - dependencies = machine.F,radlw_param.f,radsw_param.f - dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90,rte-rrtmgp/rte/mo_optical_props.F90 - dependencies = rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90 - dependencies = rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_rte_config.F90 - dependencies = rte-rrtmgp/rte/mo_source_functions.F90 + dependencies = hooks/machine.F,photochem/module_ozphys.F90 + dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f [ccpp-arg-table] name = CCPP_typedefs diff --git a/scm/src/GFS_typedefs.meta b/scm/src/GFS_typedefs.meta index a0db09e2d..654332198 100644 --- a/scm/src/GFS_typedefs.meta +++ b/scm/src/GFS_typedefs.meta @@ -9893,8 +9893,11 @@ name = GFS_typedefs type = module relative_path = ../../ccpp/physics/physics - dependencies = machine.F,physcons.F90,radlw_param.f,radsw_param.f - dependencies = GFDL_parse_tracers.F90,h2o_def.f,module_ozphys.F90,GFS_ccpp_suite_sim_pre.F90 + dependencies = hooks/machine.F,hooks/physcons.F90 + dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f + dependencies = photochem/h2o_def.f,photochem/module_ozphys.F90 + dependencies = MP/GFDL/GFDL_parse_tracers.F90 + dependencies = Interstitials/UFS_SCM_NEPTUNE/GFS_ccpp_suite_sim_pre.F90 [ccpp-arg-table] name = GFS_typedefs diff --git a/scm/src/scm_type_defs.meta b/scm/src/scm_type_defs.meta index 2a11f7d99..dce3cb400 100644 --- a/scm/src/scm_type_defs.meta +++ b/scm/src/scm_type_defs.meta @@ -77,7 +77,7 @@ [ccpp-table-properties] name = scm_type_defs type = module - dependencies = scm_kinds.F90,GFS_typedefs.F90,CCPP_typedefs.F90,../../ccpp/physics/physics/machine.F + dependencies = scm_kinds.F90,GFS_typedefs.F90,CCPP_typedefs.F90,../../ccpp/physics/physics/hooks/machine.F [ccpp-arg-table] name = scm_type_defs