From c31f9207d1d75f4a42e32404ba7ecad264f90404 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Fri, 1 Sep 2023 17:50:08 +0000 Subject: [PATCH 01/11] Reorganization --- .gitmodules | 2 +- physics/{ => CONV/CCC}/cu_c3_deep.F90 | 0 physics/{ => CONV/CCC}/cu_c3_driver.F90 | 0 physics/{ => CONV/CCC}/cu_c3_driver.meta | 2 +- physics/{ => CONV/CCC}/cu_c3_driver_post.F90 | 0 physics/{ => CONV/CCC}/cu_c3_driver_post.meta | 2 +- physics/{ => CONV/CCC}/cu_c3_driver_pre.F90 | 0 physics/{ => CONV/CCC}/cu_c3_driver_pre.meta | 2 +- physics/{ => CONV/CCC}/cu_c3_sh.F90 | 0 physics/{ => CONV/Chikira_Sugiyama}/cs_conv.F90 | 0 physics/{ => CONV/Chikira_Sugiyama}/cs_conv.meta | 2 +- .../{ => CONV/Chikira_Sugiyama}/cs_conv_aw_adj.F90 | 0 .../{ => CONV/Chikira_Sugiyama}/cs_conv_aw_adj.meta | 2 +- physics/{ => CONV/Chikira_Sugiyama}/cs_conv_post.F90 | 0 physics/{ => CONV/Chikira_Sugiyama}/cs_conv_post.meta | 2 +- physics/{ => CONV/Chikira_Sugiyama}/cs_conv_pre.F90 | 0 physics/{ => CONV/Chikira_Sugiyama}/cs_conv_pre.meta | 2 +- physics/{ => CONV/Grell_Freitas}/cu_gf_deep.F90 | 0 physics/{ => CONV/Grell_Freitas}/cu_gf_driver.F90 | 0 physics/{ => CONV/Grell_Freitas}/cu_gf_driver.meta | 2 +- .../{ => CONV/Grell_Freitas}/cu_gf_driver_post.F90 | 0 .../{ => CONV/Grell_Freitas}/cu_gf_driver_post.meta | 2 +- physics/{ => CONV/Grell_Freitas}/cu_gf_driver_pre.F90 | 0 .../{ => CONV/Grell_Freitas}/cu_gf_driver_pre.meta | 2 +- physics/{ => CONV/Grell_Freitas}/cu_gf_sh.F90 | 0 physics/{ => CONV/RAS}/rascnv.F90 | 0 physics/{ => CONV/RAS}/rascnv.meta | 2 +- physics/{ => CONV/SAMF}/samfaerosols.F | 0 physics/{ => CONV/SAMF}/samfdeepcnv.f | 0 physics/{ => CONV/SAMF}/samfdeepcnv.meta | 2 +- physics/{ => CONV/SAMF}/samfshalcnv.f | 0 physics/{ => CONV/SAMF}/samfshalcnv.meta | 2 +- physics/{ => CONV/SAS}/sascnvn.F | 0 physics/{ => CONV/SAS}/sascnvn.meta | 2 +- physics/{ => CONV/SAS}/shalcnv.F | 0 physics/{ => CONV/SAS}/shalcnv.meta | 2 +- physics/{ => CONV/nTiedtke}/cu_ntiedtke.F90 | 0 physics/{ => CONV/nTiedtke}/cu_ntiedtke.meta | 2 +- physics/{ => CONV/nTiedtke}/cu_ntiedtke_post.F90 | 0 physics/{ => CONV/nTiedtke}/cu_ntiedtke_post.meta | 2 +- physics/{ => CONV/nTiedtke}/cu_ntiedtke_pre.F90 | 0 physics/{ => CONV/nTiedtke}/cu_ntiedtke_pre.meta | 2 +- physics/{ => CONV}/progsigma_calc.f90 | 0 physics/{ => GWD}/cires_orowam2017.f | 0 physics/{ => GWD}/cires_tauamf_data.F90 | 0 physics/{ => GWD}/cires_ugwp.F90 | 0 physics/{ => GWD}/cires_ugwp.meta | 2 +- physics/{ => GWD}/cires_ugwp_initialize.F90 | 0 physics/{ => GWD}/cires_ugwp_module.F90 | 0 physics/{ => GWD}/cires_ugwp_post.F90 | 0 physics/{ => GWD}/cires_ugwp_post.meta | 2 +- physics/{ => GWD}/cires_ugwp_triggers.F90 | 0 physics/{ => GWD}/cires_ugwpv1_initialize.F90 | 0 physics/{ => GWD}/cires_ugwpv1_module.F90 | 0 physics/{ => GWD}/cires_ugwpv1_oro.F90 | 0 physics/{ => GWD}/cires_ugwpv1_solv2.F90 | 0 physics/{ => GWD}/cires_ugwpv1_sporo.F90 | 0 physics/{ => GWD}/cires_ugwpv1_triggers.F90 | 0 physics/{ => GWD}/drag_suite.F90 | 0 physics/{ => GWD}/drag_suite.meta | 2 +- physics/{ => GWD}/gwdc.f | 0 physics/{ => GWD}/gwdc.meta | 2 +- physics/{ => GWD}/gwdc_post.f | 0 physics/{ => GWD}/gwdc_post.meta | 2 +- physics/{ => GWD}/gwdc_pre.f | 0 physics/{ => GWD}/gwdc_pre.meta | 2 +- physics/{ => GWD}/gwdps.f | 0 physics/{ => GWD}/gwdps.meta | 2 +- physics/{ => GWD}/rayleigh_damp.f | 0 physics/{ => GWD}/rayleigh_damp.meta | 2 +- physics/{ => GWD}/ugwp_driver_v0.F | 0 physics/{ => GWD}/ugwpv1_gsldrag.F90 | 0 physics/{ => GWD}/ugwpv1_gsldrag.meta | 2 +- physics/{ => GWD}/ugwpv1_gsldrag_post.F90 | 0 physics/{ => GWD}/ugwpv1_gsldrag_post.meta | 2 +- physics/{ => GWD}/unified_ugwp.F90 | 0 physics/{ => GWD}/unified_ugwp.meta | 8 ++++---- physics/{ => GWD}/unified_ugwp_post.F90 | 0 physics/{ => GWD}/unified_ugwp_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_DCNV_generic_post.F90 | 0 .../GFS}/GFS_DCNV_generic_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_DCNV_generic_pre.F90 | 0 .../{ => Interstitials/GFS}/GFS_DCNV_generic_pre.meta | 2 +- .../{ => Interstitials/GFS}/GFS_GWD_generic_post.F90 | 0 .../{ => Interstitials/GFS}/GFS_GWD_generic_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_GWD_generic_pre.F90 | 0 .../{ => Interstitials/GFS}/GFS_GWD_generic_pre.meta | 2 +- .../{ => Interstitials/GFS}/GFS_MP_generic_post.F90 | 0 .../{ => Interstitials/GFS}/GFS_MP_generic_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_MP_generic_pre.F90 | 0 .../{ => Interstitials/GFS}/GFS_MP_generic_pre.meta | 2 +- .../GFS}/GFS_PBL_generic_common.F90 | 0 .../{ => Interstitials/GFS}/GFS_PBL_generic_post.F90 | 0 .../{ => Interstitials/GFS}/GFS_PBL_generic_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_PBL_generic_pre.F90 | 0 .../{ => Interstitials/GFS}/GFS_PBL_generic_pre.meta | 2 +- .../{ => Interstitials/GFS}/GFS_SCNV_generic_post.F90 | 0 .../GFS}/GFS_SCNV_generic_post.meta | 2 +- .../{ => Interstitials/GFS}/GFS_SCNV_generic_pre.F90 | 0 .../{ => Interstitials/GFS}/GFS_SCNV_generic_pre.meta | 2 +- .../{ => Interstitials/GFS}/GFS_cloud_diagnostics.F90 | 0 .../GFS}/GFS_cloud_diagnostics.meta | 3 ++- physics/{ => Interstitials/GFS}/GFS_debug.F90 | 0 physics/{ => Interstitials/GFS}/GFS_debug.meta | 2 +- .../GFS}/GFS_phys_time_vary.fv3.F90 | 0 .../GFS}/GFS_phys_time_vary.fv3.meta | 11 +++++++++-- .../GFS}/GFS_phys_time_vary.scm.F90 | 0 .../GFS}/GFS_phys_time_vary.scm.meta | 11 +++++++++-- .../{ => Interstitials/GFS}/GFS_rad_time_vary.fv3.F90 | 0 .../GFS}/GFS_rad_time_vary.fv3.meta | 3 ++- .../{ => Interstitials/GFS}/GFS_rad_time_vary.scm.F90 | 0 .../GFS}/GFS_rad_time_vary.scm.meta | 3 ++- .../{ => Interstitials/GFS}/GFS_radiation_surface.F90 | 0 .../GFS}/GFS_radiation_surface.meta | 5 ++++- physics/{ => Interstitials/GFS}/GFS_rrtmg_post.F90 | 0 physics/{ => Interstitials/GFS}/GFS_rrtmg_post.meta | 4 +++- physics/{ => Interstitials/GFS}/GFS_rrtmg_pre.F90 | 0 physics/{ => Interstitials/GFS}/GFS_rrtmg_pre.meta | 10 +++++++--- physics/{ => Interstitials/GFS}/GFS_rrtmg_setup.F90 | 0 physics/{ => Interstitials/GFS}/GFS_rrtmg_setup.meta | 8 ++++++-- .../{ => Interstitials/GFS}/GFS_rrtmgp_cloud_mp.F90 | 0 .../{ => Interstitials/GFS}/GFS_rrtmgp_cloud_mp.meta | 5 ++++- .../GFS}/GFS_rrtmgp_cloud_overlap.F90 | 0 .../GFS}/GFS_rrtmgp_cloud_overlap.meta | 4 +++- physics/{ => Interstitials/GFS}/GFS_rrtmgp_post.F90 | 0 physics/{ => Interstitials/GFS}/GFS_rrtmgp_post.meta | 4 +++- physics/{ => Interstitials/GFS}/GFS_rrtmgp_pre.F90 | 1 - physics/{ => Interstitials/GFS}/GFS_rrtmgp_pre.meta | 5 +++-- physics/{ => Interstitials/GFS}/GFS_rrtmgp_setup.F90 | 0 physics/{ => Interstitials/GFS}/GFS_rrtmgp_setup.meta | 6 ++++-- physics/{ => Interstitials/GFS}/GFS_stochastics.F90 | 0 physics/{ => Interstitials/GFS}/GFS_stochastics.meta | 2 +- .../GFS}/GFS_suite_interstitial_1.F90 | 0 .../GFS}/GFS_suite_interstitial_1.meta | 2 +- .../GFS}/GFS_suite_interstitial_2.F90 | 0 .../GFS}/GFS_suite_interstitial_2.meta | 2 +- .../GFS}/GFS_suite_interstitial_3.F90 | 0 .../GFS}/GFS_suite_interstitial_3.meta | 2 +- .../GFS}/GFS_suite_interstitial_4.F90 | 0 .../GFS}/GFS_suite_interstitial_4.meta | 4 +++- .../GFS}/GFS_suite_interstitial_5.F90 | 0 .../GFS}/GFS_suite_interstitial_5.meta | 2 +- .../GFS}/GFS_suite_interstitial_phys_reset.F90 | 0 .../GFS}/GFS_suite_interstitial_phys_reset.meta | 2 +- .../GFS}/GFS_suite_interstitial_rad_reset.F90 | 0 .../GFS}/GFS_suite_interstitial_rad_reset.meta | 2 +- .../GFS}/GFS_suite_stateout_reset.F90 | 0 .../GFS}/GFS_suite_stateout_reset.meta | 2 +- .../GFS}/GFS_suite_stateout_update.F90 | 0 .../GFS}/GFS_suite_stateout_update.meta | 2 +- .../GFS}/GFS_surface_composites_inter.F90 | 0 .../GFS}/GFS_surface_composites_inter.meta | 2 +- .../GFS}/GFS_surface_composites_post.F90 | 0 .../GFS}/GFS_surface_composites_post.meta | 3 ++- .../GFS}/GFS_surface_composites_pre.F90 | 0 .../GFS}/GFS_surface_composites_pre.meta | 2 +- .../GFS}/GFS_surface_generic_post.F90 | 0 .../GFS}/GFS_surface_generic_post.meta | 2 +- .../GFS}/GFS_surface_generic_pre.F90 | 0 .../GFS}/GFS_surface_generic_pre.meta | 3 ++- .../GFS}/GFS_surface_loop_control_part1.F90 | 0 .../GFS}/GFS_surface_loop_control_part1.meta | 2 +- .../GFS}/GFS_surface_loop_control_part2.F90 | 0 .../GFS}/GFS_surface_loop_control_part2.meta | 2 +- .../{ => Interstitials/GFS}/GFS_time_vary_pre.fv3.F90 | 0 .../GFS}/GFS_time_vary_pre.fv3.meta | 3 ++- .../{ => Interstitials/GFS}/GFS_time_vary_pre.scm.F90 | 0 .../GFS}/GFS_time_vary_pre.scm.meta | 3 ++- physics/{ => Interstitials/GFS}/aerinterp.F90 | 0 physics/{ => Interstitials/GFS}/cnvc90.f | 0 physics/{ => Interstitials/GFS}/cnvc90.meta | 2 +- physics/{ => Interstitials/GFS}/dcyc2t3.f | 0 physics/{ => Interstitials/GFS}/dcyc2t3.meta | 2 +- physics/{ => Interstitials/GFS}/gcycle.F90 | 0 physics/{ => Interstitials/GFS}/iccn_def.F | 0 physics/{ => Interstitials/GFS}/iccninterp.F90 | 0 .../GFS}/maximum_hourly_diagnostics.F90 | 0 .../GFS}/maximum_hourly_diagnostics.meta | 2 +- physics/{ => Interstitials/GFS}/phys_tend.F90 | 0 physics/{ => Interstitials/GFS}/phys_tend.meta | 2 +- physics/{ => Interstitials/GFS}/scm_sfc_flux_spec.F90 | 0 .../{ => Interstitials/GFS}/scm_sfc_flux_spec.meta | 2 +- physics/{ => Interstitials/GFS}/sfcsub.F | 0 physics/{ => Interstitials/GFS}/sgscloud_radpost.F90 | 0 physics/{ => Interstitials/GFS}/sgscloud_radpost.meta | 2 +- physics/{ => Interstitials/GFS}/sgscloud_radpre.F90 | 0 physics/{ => Interstitials/GFS}/sgscloud_radpre.meta | 5 ++++- physics/{ => Land/CLM_lake}/clm_lake.f90 | 0 physics/{ => Land/CLM_lake}/clm_lake.meta | 2 +- physics/{ => Land/Flake}/flake.F90 | 0 physics/{ => Land/Flake}/flake_driver.F90 | 0 physics/{ => Land/Flake}/flake_driver.meta | 2 +- physics/{ => Land/Noah}/lsm_noah.f | 0 physics/{ => Land/Noah}/lsm_noah.meta | 3 ++- physics/{ => Land/Noah}/sflx.f | 0 physics/{ => Land/Noah}/surface_perturbation.F90 | 0 .../{ => Land/Noahmp}/module_sf_noahmp_glacier.F90 | 0 physics/{ => Land/Noahmp}/module_sf_noahmplsm.F90 | 0 physics/{ => Land/Noahmp}/noahmp_tables.f90 | 0 physics/{ => Land/Noahmp}/noahmpdrv.F90 | 0 physics/{ => Land/Noahmp}/noahmpdrv.meta | 2 +- physics/{ => Land/Noahmp}/noahmptable.tbl | 0 physics/{ => Land/RUC}/lsm_ruc.F90 | 0 physics/{ => Land/RUC}/lsm_ruc.meta | 2 +- physics/{ => Land/RUC}/module_sf_ruclsm.F90 | 0 physics/{ => Land/RUC}/module_soil_pre.F90 | 0 physics/{ => Land/RUC}/namelist_soilveg_ruc.F90 | 0 physics/{ => Land/RUC}/set_soilveg_ruc.F90 | 0 physics/{ => Land}/namelist_soilveg.f | 0 physics/{ => Land}/set_soilveg.f | 0 .../{ => MP/Ferrier_Aligo}/module_MP_FER_HIRES.F90 | 0 physics/{ => MP/Ferrier_Aligo}/mp_fer_hires.F90 | 0 physics/{ => MP/Ferrier_Aligo}/mp_fer_hires.meta | 2 +- physics/{ => MP/GFDL}/GFDL_parse_tracers.F90 | 0 physics/{ => MP/GFDL}/fv_sat_adj.F90 | 0 physics/{ => MP/GFDL}/fv_sat_adj.meta | 2 +- physics/{ => MP/GFDL}/gfdl_cloud_microphys.F90 | 0 physics/{ => MP/GFDL}/gfdl_cloud_microphys.meta | 2 +- physics/{ => MP/GFDL}/gfdl_sfc_layer.F90 | 0 physics/{ => MP/GFDL}/gfdl_sfc_layer.meta | 2 +- physics/{ => MP/GFDL}/module_gfdl_cloud_microphys.F90 | 0 physics/{ => MP/GFDL}/module_sf_exchcoef.f90 | 0 physics/{ => MP/GFDL}/multi_gases.F90 | 0 physics/{ => MP/Morrison_Gettelman}/aer_cloud.F | 0 physics/{ => MP/Morrison_Gettelman}/aerclm_def.F | 0 physics/{ => MP/Morrison_Gettelman}/cldmacro.F | 0 physics/{ => MP/Morrison_Gettelman}/cldwat2m_micro.F | 0 physics/{ => MP/Morrison_Gettelman}/m_micro.F90 | 0 physics/{ => MP/Morrison_Gettelman}/m_micro.meta | 2 +- physics/{ => MP/Morrison_Gettelman}/m_micro_post.F90 | 0 physics/{ => MP/Morrison_Gettelman}/m_micro_post.meta | 2 +- physics/{ => MP/Morrison_Gettelman}/m_micro_pre.F90 | 0 physics/{ => MP/Morrison_Gettelman}/m_micro_pre.meta | 2 +- physics/{ => MP/Morrison_Gettelman}/micro_mg2_0.F90 | 0 physics/{ => MP/Morrison_Gettelman}/micro_mg3_0.F90 | 0 .../{ => MP/Morrison_Gettelman}/micro_mg_utils.F90 | 0 physics/{ => MP/Morrison_Gettelman}/wv_saturation.F | 0 physics/{ => MP/NSSL}/module_mp_nssl_2mom.F90 | 0 physics/{ => MP/NSSL}/mp_nssl.F90 | 0 physics/{ => MP/NSSL}/mp_nssl.meta | 2 +- physics/{ => MP/Thompson}/module_mp_radar.F90 | 0 physics/{ => MP/Thompson}/module_mp_thompson.F90 | 0 .../module_mp_thompson_make_number_concentrations.F90 | 0 physics/{ => MP/Thompson}/mp_thompson.F90 | 0 physics/{ => MP/Thompson}/mp_thompson.meta | 2 +- physics/{ => MP/Thompson}/mp_thompson_post.F90 | 0 physics/{ => MP/Thompson}/mp_thompson_post.meta | 2 +- physics/{ => MP/Thompson}/mp_thompson_pre.F90 | 0 physics/{ => MP/Thompson}/mp_thompson_pre.meta | 2 +- physics/{ => MP/Zhao_Carr}/zhaocarr_gscond.f | 0 physics/{ => MP/Zhao_Carr}/zhaocarr_gscond.meta | 2 +- physics/{ => MP/Zhao_Carr}/zhaocarr_precpd.f | 0 physics/{ => MP/Zhao_Carr}/zhaocarr_precpd.meta | 2 +- physics/{ => MP}/calpreciptype.f90 | 0 physics/{ => NOTUSED}/gfs_phy_tracer_config.F | 0 physics/{ => NOTUSED}/gocart_tracer_config_stub.f | 0 physics/{ => NOTUSED}/rrtmg_lw_pre.F90 | 0 physics/{ => NOTUSED}/rrtmg_lw_pre.meta | 0 physics/{ => PBL/HEDMF}/hedmf.f | 0 physics/{ => PBL/HEDMF}/hedmf.meta | 2 +- physics/{ => PBL/MYJ}/module_BL_MYJPBL.F90 | 0 physics/{ => PBL/MYJ}/myjpbl_wrapper.F90 | 0 physics/{ => PBL/MYJ}/myjpbl_wrapper.meta | 2 +- physics/{ => PBL/MYNN_EDMF}/bl_mynn_common.f90 | 0 physics/{ => PBL/MYNN_EDMF}/module_bl_mynn.F90 | 0 physics/{ => PBL/MYNN_EDMF}/mynnedmf_wrapper.F90 | 0 physics/{ => PBL/MYNN_EDMF}/mynnedmf_wrapper.meta | 2 +- physics/{ => PBL/SATMEDMF}/mfscu.f | 0 physics/{ => PBL/SATMEDMF}/mfscuq.f | 0 physics/{ => PBL/SATMEDMF}/satmedmfvdif.F | 0 physics/{ => PBL/SATMEDMF}/satmedmfvdif.meta | 2 +- physics/{ => PBL/SATMEDMF}/satmedmfvdifq.F | 0 physics/{ => PBL/SATMEDMF}/satmedmfvdifq.meta | 2 +- physics/{ => PBL/SHOC}/moninshoc.f | 0 physics/{ => PBL/SHOC}/moninshoc.meta | 2 +- physics/{ => PBL/SHOC}/shoc.F90 | 0 physics/{ => PBL/SHOC}/shoc.meta | 2 +- physics/{ => PBL/YSU}/ysuvdif.F90 | 0 physics/{ => PBL/YSU}/ysuvdif.meta | 2 +- physics/{ => PBL}/mfpbl.f | 0 physics/{ => PBL}/mfpblt.f | 0 physics/{ => PBL}/mfpbltq.f | 0 physics/{ => PBL/saYSU}/shinhongvdif.F90 | 0 physics/{ => PBL/saYSU}/shinhongvdif.meta | 2 +- physics/{ => PBL}/tridi.f | 0 physics/{ => Radiation/RRTMG}/iounitdef.f | 0 physics/{ => Radiation/RRTMG}/module_bfmicrophysics.f | 0 physics/{ => Radiation/RRTMG}/rad_sw_pre.F90 | 0 physics/{ => Radiation/RRTMG}/rad_sw_pre.meta | 2 +- physics/{ => Radiation/RRTMG}/radcons.f90 | 0 physics/{ => Radiation/RRTMG}/radlw_datatb.f | 0 physics/{ => Radiation/RRTMG}/radlw_main.F90 | 0 physics/{ => Radiation/RRTMG}/radlw_main.meta | 2 +- physics/{ => Radiation/RRTMG}/radlw_param.f | 0 physics/{ => Radiation/RRTMG}/radlw_param.meta | 0 physics/{ => Radiation/RRTMG}/radsw_datatb.f | 0 physics/{ => Radiation/RRTMG}/radsw_main.F90 | 0 physics/{ => Radiation/RRTMG}/radsw_main.meta | 2 +- physics/{ => Radiation/RRTMG}/radsw_param.f | 0 physics/{ => Radiation/RRTMG}/radsw_param.meta | 0 .../{ => Radiation/RRTMG}/rrtmg_lw_cloud_optics.F90 | 0 physics/{ => Radiation/RRTMG}/rrtmg_lw_post.F90 | 0 physics/{ => Radiation/RRTMG}/rrtmg_lw_post.meta | 2 +- .../{ => Radiation/RRTMG}/rrtmg_sw_cloud_optics.F90 | 0 physics/{ => Radiation/RRTMG}/rrtmg_sw_post.F90 | 0 physics/{ => Radiation/RRTMG}/rrtmg_sw_post.meta | 2 +- .../{ => Radiation/RRTMGP}/rrtmgp_aerosol_optics.F90 | 0 .../{ => Radiation/RRTMGP}/rrtmgp_aerosol_optics.meta | 2 +- .../{ => Radiation/RRTMGP}/rrtmgp_lw_cloud_optics.F90 | 0 .../{ => Radiation/RRTMGP}/rrtmgp_lw_gas_optics.F90 | 0 physics/{ => Radiation/RRTMGP}/rrtmgp_lw_main.F90 | 0 physics/{ => Radiation/RRTMGP}/rrtmgp_lw_main.meta | 7 ++++--- physics/{ => Radiation/RRTMGP}/rrtmgp_sampling.F90 | 0 .../{ => Radiation/RRTMGP}/rrtmgp_sw_cloud_optics.F90 | 0 .../{ => Radiation/RRTMGP}/rrtmgp_sw_gas_optics.F90 | 0 physics/{ => Radiation/RRTMGP}/rrtmgp_sw_main.F90 | 0 physics/{ => Radiation/RRTMGP}/rrtmgp_sw_main.meta | 7 ++++--- physics/{ => Radiation}/mersenne_twister.f | 0 physics/{ => Radiation}/radiation_aerosols.f | 0 physics/{ => Radiation}/radiation_astronomy.f | 0 physics/{ => Radiation}/radiation_cloud_overlap.F90 | 0 physics/{ => Radiation}/radiation_clouds.f | 0 physics/{ => Radiation}/radiation_gases.f | 0 physics/{ => Radiation}/radiation_surface.f | 0 physics/{ => Radiation}/radiation_tools.F90 | 0 physics/{ => SFC_Layer/GFS_sfc}/date_def.f | 0 physics/{ => SFC_Layer/GFS_sfc}/module_nst_model.f90 | 0 .../{ => SFC_Layer/GFS_sfc}/module_nst_parameters.f90 | 0 .../{ => SFC_Layer/GFS_sfc}/module_nst_water_prop.f90 | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_cice.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_cice.meta | 3 ++- physics/{ => SFC_Layer/GFS_sfc}/sfc_diag.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_diag.meta | 3 ++- physics/{ => SFC_Layer/GFS_sfc}/sfc_diag_post.F90 | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_diag_post.meta | 3 ++- physics/{ => SFC_Layer/GFS_sfc}/sfc_diff.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_diff.meta | 3 ++- physics/{ => SFC_Layer/GFS_sfc}/sfc_nst.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_nst.meta | 2 +- physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_post.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_post.meta | 2 +- physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_pre.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_pre.meta | 2 +- physics/{ => SFC_Layer/GFS_sfc}/sfc_ocean.F | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_ocean.meta | 2 +- physics/{ => SFC_Layer/GFS_sfc}/sfc_sice.f | 0 physics/{ => SFC_Layer/GFS_sfc}/sfc_sice.meta | 3 ++- physics/{ => SFC_Layer/MYJ}/module_SF_JSFC.F90 | 0 physics/{ => SFC_Layer/MYJ}/myjsfc_wrapper.F90 | 0 physics/{ => SFC_Layer/MYJ}/myjsfc_wrapper.meta | 2 +- physics/{ => SFC_Layer/MYNN}/module_sf_mynn.F90 | 0 physics/{ => SFC_Layer/MYNN}/mynnsfc_wrapper.F90 | 0 physics/{ => SFC_Layer/MYNN}/mynnsfc_wrapper.meta | 2 +- physics/{ => h2o_photo}/h2o_def.f | 0 physics/{ => h2o_photo}/h2o_def.meta | 2 +- physics/{ => h2o_photo}/h2ointerp.f90 | 0 physics/{ => h2o_photo}/h2ophys.f | 0 physics/{ => h2o_photo}/h2ophys.meta | 2 +- physics/{ => hooks}/machine.F | 0 physics/{ => hooks}/machine.meta | 0 physics/{ => hooks}/physcons.F90 | 0 physics/{ => o3_photo}/ozinterp.f90 | 0 physics/{ => o3_photo}/ozne_def.f | 0 physics/{ => o3_photo}/ozne_def.meta | 2 +- physics/{ => o3_photo}/ozphys.f | 0 physics/{ => o3_photo}/ozphys.meta | 2 +- physics/{ => o3_photo}/ozphys_2015.f | 0 physics/{ => o3_photo}/ozphys_2015.meta | 2 +- physics/rte-rrtmgp | 1 - physics/smoke_dust/rrfs_smoke_postpbl.meta | 2 +- physics/smoke_dust/rrfs_smoke_wrapper.meta | 2 +- physics/{ => tools}/funcphys.f90 | 0 physics/{ => tools}/get_phi_fv3.F90 | 0 physics/{ => tools}/get_phi_fv3.meta | 2 +- physics/{ => tools}/get_prs_fv3.F90 | 0 physics/{ => tools}/get_prs_fv3.meta | 2 +- 376 files changed, 208 insertions(+), 153 deletions(-) rename physics/{ => CONV/CCC}/cu_c3_deep.F90 (100%) rename physics/{ => CONV/CCC}/cu_c3_driver.F90 (100%) rename physics/{ => CONV/CCC}/cu_c3_driver.meta (99%) rename physics/{ => CONV/CCC}/cu_c3_driver_post.F90 (100%) rename physics/{ => CONV/CCC}/cu_c3_driver_post.meta (98%) rename physics/{ => CONV/CCC}/cu_c3_driver_pre.F90 (100%) rename physics/{ => CONV/CCC}/cu_c3_driver_pre.meta (98%) rename physics/{ => CONV/CCC}/cu_c3_sh.F90 (100%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv.F90 (100%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv.meta (99%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_aw_adj.F90 (100%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_aw_adj.meta (99%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_post.F90 (100%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_post.meta (97%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_pre.F90 (100%) rename physics/{ => CONV/Chikira_Sugiyama}/cs_conv_pre.meta (99%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_deep.F90 (100%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver.F90 (100%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver.meta (99%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver_post.F90 (100%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver_post.meta (98%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver_pre.F90 (100%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_driver_pre.meta (98%) rename physics/{ => CONV/Grell_Freitas}/cu_gf_sh.F90 (100%) rename physics/{ => CONV/RAS}/rascnv.F90 (100%) rename physics/{ => CONV/RAS}/rascnv.meta (99%) rename physics/{ => CONV/SAMF}/samfaerosols.F (100%) rename physics/{ => CONV/SAMF}/samfdeepcnv.f (100%) rename physics/{ => CONV/SAMF}/samfdeepcnv.meta (99%) rename physics/{ => CONV/SAMF}/samfshalcnv.f (100%) rename physics/{ => CONV/SAMF}/samfshalcnv.meta (99%) rename physics/{ => CONV/SAS}/sascnvn.F (100%) rename physics/{ => CONV/SAS}/sascnvn.meta (99%) rename physics/{ => CONV/SAS}/shalcnv.F (100%) rename physics/{ => CONV/SAS}/shalcnv.meta (99%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke.F90 (100%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke.meta (99%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke_post.F90 (100%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke_post.meta (97%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke_pre.F90 (100%) rename physics/{ => CONV/nTiedtke}/cu_ntiedtke_pre.meta (98%) rename physics/{ => CONV}/progsigma_calc.f90 (100%) rename physics/{ => GWD}/cires_orowam2017.f (100%) rename physics/{ => GWD}/cires_tauamf_data.F90 (100%) rename physics/{ => GWD}/cires_ugwp.F90 (100%) rename physics/{ => GWD}/cires_ugwp.meta (99%) rename physics/{ => GWD}/cires_ugwp_initialize.F90 (100%) rename physics/{ => GWD}/cires_ugwp_module.F90 (100%) rename physics/{ => GWD}/cires_ugwp_post.F90 (100%) rename physics/{ => GWD}/cires_ugwp_post.meta (99%) rename physics/{ => GWD}/cires_ugwp_triggers.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_initialize.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_module.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_oro.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_solv2.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_sporo.F90 (100%) rename physics/{ => GWD}/cires_ugwpv1_triggers.F90 (100%) rename physics/{ => GWD}/drag_suite.F90 (100%) rename physics/{ => GWD}/drag_suite.meta (99%) rename physics/{ => GWD}/gwdc.f (100%) rename physics/{ => GWD}/gwdc.meta (99%) rename physics/{ => GWD}/gwdc_post.f (100%) rename physics/{ => GWD}/gwdc_post.meta (99%) rename physics/{ => GWD}/gwdc_pre.f (100%) rename physics/{ => GWD}/gwdc_pre.meta (99%) rename physics/{ => GWD}/gwdps.f (100%) rename physics/{ => GWD}/gwdps.meta (99%) rename physics/{ => GWD}/rayleigh_damp.f (100%) rename physics/{ => GWD}/rayleigh_damp.meta (99%) rename physics/{ => GWD}/ugwp_driver_v0.F (100%) rename physics/{ => GWD}/ugwpv1_gsldrag.F90 (100%) rename physics/{ => GWD}/ugwpv1_gsldrag.meta (99%) rename physics/{ => GWD}/ugwpv1_gsldrag_post.F90 (100%) rename physics/{ => GWD}/ugwpv1_gsldrag_post.meta (99%) rename physics/{ => GWD}/unified_ugwp.F90 (100%) rename physics/{ => GWD}/unified_ugwp.meta (99%) rename physics/{ => GWD}/unified_ugwp_post.F90 (100%) rename physics/{ => GWD}/unified_ugwp_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_DCNV_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_DCNV_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_DCNV_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_DCNV_generic_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_GWD_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_GWD_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_GWD_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_GWD_generic_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_MP_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_MP_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_MP_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_MP_generic_pre.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_PBL_generic_common.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_PBL_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_PBL_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_PBL_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_PBL_generic_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_SCNV_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_SCNV_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_SCNV_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_SCNV_generic_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_cloud_diagnostics.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_cloud_diagnostics.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_debug.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_debug.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_phys_time_vary.fv3.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_phys_time_vary.fv3.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_phys_time_vary.scm.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_phys_time_vary.scm.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rad_time_vary.fv3.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rad_time_vary.fv3.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rad_time_vary.scm.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rad_time_vary.scm.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_radiation_surface.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_radiation_surface.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_post.meta (97%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_pre.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_setup.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmg_setup.meta (97%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_cloud_mp.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_cloud_mp.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_cloud_overlap.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_cloud_overlap.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_post.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_pre.F90 (99%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_pre.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_setup.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_rrtmgp_setup.meta (97%) rename physics/{ => Interstitials/GFS}/GFS_stochastics.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_stochastics.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_1.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_1.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_2.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_2.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_3.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_3.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_4.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_4.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_5.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_5.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_phys_reset.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_phys_reset.meta (96%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_rad_reset.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_interstitial_rad_reset.meta (96%) rename physics/{ => Interstitials/GFS}/GFS_suite_stateout_reset.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_stateout_reset.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_suite_stateout_update.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_suite_stateout_update.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_inter.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_inter.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_composites_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_generic_post.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_generic_post.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_generic_pre.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_generic_pre.meta (99%) rename physics/{ => Interstitials/GFS}/GFS_surface_loop_control_part1.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_loop_control_part1.meta (97%) rename physics/{ => Interstitials/GFS}/GFS_surface_loop_control_part2.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_surface_loop_control_part2.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_time_vary_pre.fv3.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_time_vary_pre.fv3.meta (98%) rename physics/{ => Interstitials/GFS}/GFS_time_vary_pre.scm.F90 (100%) rename physics/{ => Interstitials/GFS}/GFS_time_vary_pre.scm.meta (98%) rename physics/{ => Interstitials/GFS}/aerinterp.F90 (100%) rename physics/{ => Interstitials/GFS}/cnvc90.f (100%) rename physics/{ => Interstitials/GFS}/cnvc90.meta (98%) rename physics/{ => Interstitials/GFS}/dcyc2t3.f (100%) rename physics/{ => Interstitials/GFS}/dcyc2t3.meta (99%) rename physics/{ => Interstitials/GFS}/gcycle.F90 (100%) rename physics/{ => Interstitials/GFS}/iccn_def.F (100%) rename physics/{ => Interstitials/GFS}/iccninterp.F90 (100%) rename physics/{ => Interstitials/GFS}/maximum_hourly_diagnostics.F90 (100%) rename physics/{ => Interstitials/GFS}/maximum_hourly_diagnostics.meta (99%) rename physics/{ => Interstitials/GFS}/phys_tend.F90 (100%) rename physics/{ => Interstitials/GFS}/phys_tend.meta (98%) rename physics/{ => Interstitials/GFS}/scm_sfc_flux_spec.F90 (100%) rename physics/{ => Interstitials/GFS}/scm_sfc_flux_spec.meta (99%) rename physics/{ => Interstitials/GFS}/sfcsub.F (100%) rename physics/{ => Interstitials/GFS}/sgscloud_radpost.F90 (100%) rename physics/{ => Interstitials/GFS}/sgscloud_radpost.meta (98%) rename physics/{ => Interstitials/GFS}/sgscloud_radpre.F90 (100%) rename physics/{ => Interstitials/GFS}/sgscloud_radpre.meta (98%) rename physics/{ => Land/CLM_lake}/clm_lake.f90 (100%) rename physics/{ => Land/CLM_lake}/clm_lake.meta (99%) rename physics/{ => Land/Flake}/flake.F90 (100%) rename physics/{ => Land/Flake}/flake_driver.F90 (100%) rename physics/{ => Land/Flake}/flake_driver.meta (99%) rename physics/{ => Land/Noah}/lsm_noah.f (100%) rename physics/{ => Land/Noah}/lsm_noah.meta (99%) rename physics/{ => Land/Noah}/sflx.f (100%) rename physics/{ => Land/Noah}/surface_perturbation.F90 (100%) rename physics/{ => Land/Noahmp}/module_sf_noahmp_glacier.F90 (100%) rename physics/{ => Land/Noahmp}/module_sf_noahmplsm.F90 (100%) rename physics/{ => Land/Noahmp}/noahmp_tables.f90 (100%) rename physics/{ => Land/Noahmp}/noahmpdrv.F90 (100%) rename physics/{ => Land/Noahmp}/noahmpdrv.meta (99%) rename physics/{ => Land/Noahmp}/noahmptable.tbl (100%) rename physics/{ => Land/RUC}/lsm_ruc.F90 (100%) rename physics/{ => Land/RUC}/lsm_ruc.meta (99%) rename physics/{ => Land/RUC}/module_sf_ruclsm.F90 (100%) rename physics/{ => Land/RUC}/module_soil_pre.F90 (100%) rename physics/{ => Land/RUC}/namelist_soilveg_ruc.F90 (100%) rename physics/{ => Land/RUC}/set_soilveg_ruc.F90 (100%) rename physics/{ => Land}/namelist_soilveg.f (100%) rename physics/{ => Land}/set_soilveg.f (100%) rename physics/{ => MP/Ferrier_Aligo}/module_MP_FER_HIRES.F90 (100%) rename physics/{ => MP/Ferrier_Aligo}/mp_fer_hires.F90 (100%) rename physics/{ => MP/Ferrier_Aligo}/mp_fer_hires.meta (99%) rename physics/{ => MP/GFDL}/GFDL_parse_tracers.F90 (100%) rename physics/{ => MP/GFDL}/fv_sat_adj.F90 (100%) rename physics/{ => MP/GFDL}/fv_sat_adj.meta (99%) rename physics/{ => MP/GFDL}/gfdl_cloud_microphys.F90 (100%) rename physics/{ => MP/GFDL}/gfdl_cloud_microphys.meta (99%) rename physics/{ => MP/GFDL}/gfdl_sfc_layer.F90 (100%) rename physics/{ => MP/GFDL}/gfdl_sfc_layer.meta (99%) rename physics/{ => MP/GFDL}/module_gfdl_cloud_microphys.F90 (100%) rename physics/{ => MP/GFDL}/module_sf_exchcoef.f90 (100%) rename physics/{ => MP/GFDL}/multi_gases.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/aer_cloud.F (100%) rename physics/{ => MP/Morrison_Gettelman}/aerclm_def.F (100%) rename physics/{ => MP/Morrison_Gettelman}/cldmacro.F (100%) rename physics/{ => MP/Morrison_Gettelman}/cldwat2m_micro.F (100%) rename physics/{ => MP/Morrison_Gettelman}/m_micro.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/m_micro.meta (99%) rename physics/{ => MP/Morrison_Gettelman}/m_micro_post.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/m_micro_post.meta (99%) rename physics/{ => MP/Morrison_Gettelman}/m_micro_pre.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/m_micro_pre.meta (99%) rename physics/{ => MP/Morrison_Gettelman}/micro_mg2_0.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/micro_mg3_0.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/micro_mg_utils.F90 (100%) rename physics/{ => MP/Morrison_Gettelman}/wv_saturation.F (100%) rename physics/{ => MP/NSSL}/module_mp_nssl_2mom.F90 (100%) rename physics/{ => MP/NSSL}/mp_nssl.F90 (100%) rename physics/{ => MP/NSSL}/mp_nssl.meta (99%) rename physics/{ => MP/Thompson}/module_mp_radar.F90 (100%) rename physics/{ => MP/Thompson}/module_mp_thompson.F90 (100%) rename physics/{ => MP/Thompson}/module_mp_thompson_make_number_concentrations.F90 (100%) rename physics/{ => MP/Thompson}/mp_thompson.F90 (100%) rename physics/{ => MP/Thompson}/mp_thompson.meta (99%) rename physics/{ => MP/Thompson}/mp_thompson_post.F90 (100%) rename physics/{ => MP/Thompson}/mp_thompson_post.meta (98%) rename physics/{ => MP/Thompson}/mp_thompson_pre.F90 (100%) rename physics/{ => MP/Thompson}/mp_thompson_pre.meta (97%) rename physics/{ => MP/Zhao_Carr}/zhaocarr_gscond.f (100%) rename physics/{ => MP/Zhao_Carr}/zhaocarr_gscond.meta (98%) rename physics/{ => MP/Zhao_Carr}/zhaocarr_precpd.f (100%) rename physics/{ => MP/Zhao_Carr}/zhaocarr_precpd.meta (98%) rename physics/{ => MP}/calpreciptype.f90 (100%) rename physics/{ => NOTUSED}/gfs_phy_tracer_config.F (100%) rename physics/{ => NOTUSED}/gocart_tracer_config_stub.f (100%) rename physics/{ => NOTUSED}/rrtmg_lw_pre.F90 (100%) rename physics/{ => NOTUSED}/rrtmg_lw_pre.meta (100%) rename physics/{ => PBL/HEDMF}/hedmf.f (100%) rename physics/{ => PBL/HEDMF}/hedmf.meta (99%) rename physics/{ => PBL/MYJ}/module_BL_MYJPBL.F90 (100%) rename physics/{ => PBL/MYJ}/myjpbl_wrapper.F90 (100%) rename physics/{ => PBL/MYJ}/myjpbl_wrapper.meta (99%) rename physics/{ => PBL/MYNN_EDMF}/bl_mynn_common.f90 (100%) rename physics/{ => PBL/MYNN_EDMF}/module_bl_mynn.F90 (100%) rename physics/{ => PBL/MYNN_EDMF}/mynnedmf_wrapper.F90 (100%) rename physics/{ => PBL/MYNN_EDMF}/mynnedmf_wrapper.meta (99%) rename physics/{ => PBL/SATMEDMF}/mfscu.f (100%) rename physics/{ => PBL/SATMEDMF}/mfscuq.f (100%) rename physics/{ => PBL/SATMEDMF}/satmedmfvdif.F (100%) rename physics/{ => PBL/SATMEDMF}/satmedmfvdif.meta (99%) rename physics/{ => PBL/SATMEDMF}/satmedmfvdifq.F (100%) rename physics/{ => PBL/SATMEDMF}/satmedmfvdifq.meta (99%) rename physics/{ => PBL/SHOC}/moninshoc.f (100%) rename physics/{ => PBL/SHOC}/moninshoc.meta (99%) rename physics/{ => PBL/SHOC}/shoc.F90 (100%) rename physics/{ => PBL/SHOC}/shoc.meta (99%) rename physics/{ => PBL/YSU}/ysuvdif.F90 (100%) rename physics/{ => PBL/YSU}/ysuvdif.meta (99%) rename physics/{ => PBL}/mfpbl.f (100%) rename physics/{ => PBL}/mfpblt.f (100%) rename physics/{ => PBL}/mfpbltq.f (100%) rename physics/{ => PBL/saYSU}/shinhongvdif.F90 (100%) rename physics/{ => PBL/saYSU}/shinhongvdif.meta (99%) rename physics/{ => PBL}/tridi.f (100%) rename physics/{ => Radiation/RRTMG}/iounitdef.f (100%) rename physics/{ => Radiation/RRTMG}/module_bfmicrophysics.f (100%) rename physics/{ => Radiation/RRTMG}/rad_sw_pre.F90 (100%) rename physics/{ => Radiation/RRTMG}/rad_sw_pre.meta (96%) rename physics/{ => Radiation/RRTMG}/radcons.f90 (100%) rename physics/{ => Radiation/RRTMG}/radlw_datatb.f (100%) rename physics/{ => Radiation/RRTMG}/radlw_main.F90 (100%) rename physics/{ => Radiation/RRTMG}/radlw_main.meta (99%) rename physics/{ => Radiation/RRTMG}/radlw_param.f (100%) rename physics/{ => Radiation/RRTMG}/radlw_param.meta (100%) rename physics/{ => Radiation/RRTMG}/radsw_datatb.f (100%) rename physics/{ => Radiation/RRTMG}/radsw_main.F90 (100%) rename physics/{ => Radiation/RRTMG}/radsw_main.meta (99%) rename physics/{ => Radiation/RRTMG}/radsw_param.f (100%) rename physics/{ => Radiation/RRTMG}/radsw_param.meta (100%) rename physics/{ => Radiation/RRTMG}/rrtmg_lw_cloud_optics.F90 (100%) rename physics/{ => Radiation/RRTMG}/rrtmg_lw_post.F90 (100%) rename physics/{ => Radiation/RRTMG}/rrtmg_lw_post.meta (99%) rename physics/{ => Radiation/RRTMG}/rrtmg_sw_cloud_optics.F90 (100%) rename physics/{ => Radiation/RRTMG}/rrtmg_sw_post.F90 (100%) rename physics/{ => Radiation/RRTMG}/rrtmg_sw_post.meta (99%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_aerosol_optics.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_aerosol_optics.meta (98%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_lw_cloud_optics.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_lw_gas_optics.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_lw_main.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_lw_main.meta (98%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_sampling.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_sw_cloud_optics.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_sw_gas_optics.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_sw_main.F90 (100%) rename physics/{ => Radiation/RRTMGP}/rrtmgp_sw_main.meta (98%) rename physics/{ => Radiation}/mersenne_twister.f (100%) rename physics/{ => Radiation}/radiation_aerosols.f (100%) rename physics/{ => Radiation}/radiation_astronomy.f (100%) rename physics/{ => Radiation}/radiation_cloud_overlap.F90 (100%) rename physics/{ => Radiation}/radiation_clouds.f (100%) rename physics/{ => Radiation}/radiation_gases.f (100%) rename physics/{ => Radiation}/radiation_surface.f (100%) rename physics/{ => Radiation}/radiation_tools.F90 (100%) rename physics/{ => SFC_Layer/GFS_sfc}/date_def.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/module_nst_model.f90 (100%) rename physics/{ => SFC_Layer/GFS_sfc}/module_nst_parameters.f90 (100%) rename physics/{ => SFC_Layer/GFS_sfc}/module_nst_water_prop.f90 (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_cice.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_cice.meta (99%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diag.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diag.meta (99%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diag_post.F90 (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diag_post.meta (98%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diff.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_diff.meta (99%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst.meta (99%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_post.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_post.meta (98%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_pre.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_nst_pre.meta (97%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_ocean.F (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_ocean.meta (99%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_sice.f (100%) rename physics/{ => SFC_Layer/GFS_sfc}/sfc_sice.meta (99%) rename physics/{ => SFC_Layer/MYJ}/module_SF_JSFC.F90 (100%) rename physics/{ => SFC_Layer/MYJ}/myjsfc_wrapper.F90 (100%) rename physics/{ => SFC_Layer/MYJ}/myjsfc_wrapper.meta (99%) rename physics/{ => SFC_Layer/MYNN}/module_sf_mynn.F90 (100%) rename physics/{ => SFC_Layer/MYNN}/mynnsfc_wrapper.F90 (100%) rename physics/{ => SFC_Layer/MYNN}/mynnsfc_wrapper.meta (99%) rename physics/{ => h2o_photo}/h2o_def.f (100%) rename physics/{ => h2o_photo}/h2o_def.meta (94%) rename physics/{ => h2o_photo}/h2ointerp.f90 (100%) rename physics/{ => h2o_photo}/h2ophys.f (100%) rename physics/{ => h2o_photo}/h2ophys.meta (98%) rename physics/{ => hooks}/machine.F (100%) rename physics/{ => hooks}/machine.meta (100%) rename physics/{ => hooks}/physcons.F90 (100%) rename physics/{ => o3_photo}/ozinterp.f90 (100%) rename physics/{ => o3_photo}/ozne_def.f (100%) rename physics/{ => o3_photo}/ozne_def.meta (95%) rename physics/{ => o3_photo}/ozphys.f (100%) rename physics/{ => o3_photo}/ozphys.meta (99%) rename physics/{ => o3_photo}/ozphys_2015.f (100%) rename physics/{ => o3_photo}/ozphys_2015.meta (99%) delete mode 160000 physics/rte-rrtmgp rename physics/{ => tools}/funcphys.f90 (100%) rename physics/{ => tools}/get_phi_fv3.F90 (100%) rename physics/{ => tools}/get_phi_fv3.meta (97%) rename physics/{ => tools}/get_prs_fv3.F90 (100%) rename physics/{ => tools}/get_prs_fv3.meta (98%) diff --git a/.gitmodules b/.gitmodules index 8758980ec..c82541c5b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "physics/rte-rrtmgp"] - path = physics/rte-rrtmgp + path = physics/Radiation/RRTMGP/rte-rrtmgp url = https://github.com/earth-system-radiation/rte-rrtmgp branch = main diff --git a/physics/cu_c3_deep.F90 b/physics/CONV/CCC/cu_c3_deep.F90 similarity index 100% rename from physics/cu_c3_deep.F90 rename to physics/CONV/CCC/cu_c3_deep.F90 diff --git a/physics/cu_c3_driver.F90 b/physics/CONV/CCC/cu_c3_driver.F90 similarity index 100% rename from physics/cu_c3_driver.F90 rename to physics/CONV/CCC/cu_c3_driver.F90 diff --git a/physics/cu_c3_driver.meta b/physics/CONV/CCC/cu_c3_driver.meta similarity index 99% rename from physics/cu_c3_driver.meta rename to physics/CONV/CCC/cu_c3_driver.meta index 999b5c2bc..bb2784642 100644 --- a/physics/cu_c3_driver.meta +++ b/physics/CONV/CCC/cu_c3_driver.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_c3_driver type = scheme - dependencies = cu_c3_deep.F90,cu_c3_sh.F90,machine.F,physcons.F90,progsigma_calc.f90 + dependencies = cu_c3_deep.F90,cu_c3_sh.F90,../../hooks/machine.F,../../hooks/physcons.F90,../progsigma_calc.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_c3_driver_post.F90 b/physics/CONV/CCC/cu_c3_driver_post.F90 similarity index 100% rename from physics/cu_c3_driver_post.F90 rename to physics/CONV/CCC/cu_c3_driver_post.F90 diff --git a/physics/cu_c3_driver_post.meta b/physics/CONV/CCC/cu_c3_driver_post.meta similarity index 98% rename from physics/cu_c3_driver_post.meta rename to physics/CONV/CCC/cu_c3_driver_post.meta index c53972f09..78dca2ed4 100644 --- a/physics/cu_c3_driver_post.meta +++ b/physics/CONV/CCC/cu_c3_driver_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_c3_driver_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_c3_driver_pre.F90 b/physics/CONV/CCC/cu_c3_driver_pre.F90 similarity index 100% rename from physics/cu_c3_driver_pre.F90 rename to physics/CONV/CCC/cu_c3_driver_pre.F90 diff --git a/physics/cu_c3_driver_pre.meta b/physics/CONV/CCC/cu_c3_driver_pre.meta similarity index 98% rename from physics/cu_c3_driver_pre.meta rename to physics/CONV/CCC/cu_c3_driver_pre.meta index c018bee9f..a022cf743 100644 --- a/physics/cu_c3_driver_pre.meta +++ b/physics/CONV/CCC/cu_c3_driver_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_c3_driver_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_c3_sh.F90 b/physics/CONV/CCC/cu_c3_sh.F90 similarity index 100% rename from physics/cu_c3_sh.F90 rename to physics/CONV/CCC/cu_c3_sh.F90 diff --git a/physics/cs_conv.F90 b/physics/CONV/Chikira_Sugiyama/cs_conv.F90 similarity index 100% rename from physics/cs_conv.F90 rename to physics/CONV/Chikira_Sugiyama/cs_conv.F90 diff --git a/physics/cs_conv.meta b/physics/CONV/Chikira_Sugiyama/cs_conv.meta similarity index 99% rename from physics/cs_conv.meta rename to physics/CONV/Chikira_Sugiyama/cs_conv.meta index fae1c91fe..49e460ed6 100644 --- a/physics/cs_conv.meta +++ b/physics/CONV/Chikira_Sugiyama/cs_conv.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = cs_conv type = scheme - dependencies = funcphys.f90,machine.F,physcons.F90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/cs_conv_aw_adj.F90 b/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90 similarity index 100% rename from physics/cs_conv_aw_adj.F90 rename to physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.F90 diff --git a/physics/cs_conv_aw_adj.meta b/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.meta similarity index 99% rename from physics/cs_conv_aw_adj.meta rename to physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.meta index 0dada0fd5..54350dbac 100644 --- a/physics/cs_conv_aw_adj.meta +++ b/physics/CONV/Chikira_Sugiyama/cs_conv_aw_adj.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cs_conv_aw_adj type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cs_conv_post.F90 b/physics/CONV/Chikira_Sugiyama/cs_conv_post.F90 similarity index 100% rename from physics/cs_conv_post.F90 rename to physics/CONV/Chikira_Sugiyama/cs_conv_post.F90 diff --git a/physics/cs_conv_post.meta b/physics/CONV/Chikira_Sugiyama/cs_conv_post.meta similarity index 97% rename from physics/cs_conv_post.meta rename to physics/CONV/Chikira_Sugiyama/cs_conv_post.meta index 116ffbef4..75de3fca7 100644 --- a/physics/cs_conv_post.meta +++ b/physics/CONV/Chikira_Sugiyama/cs_conv_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = cs_conv_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cs_conv_pre.F90 b/physics/CONV/Chikira_Sugiyama/cs_conv_pre.F90 similarity index 100% rename from physics/cs_conv_pre.F90 rename to physics/CONV/Chikira_Sugiyama/cs_conv_pre.F90 diff --git a/physics/cs_conv_pre.meta b/physics/CONV/Chikira_Sugiyama/cs_conv_pre.meta similarity index 99% rename from physics/cs_conv_pre.meta rename to physics/CONV/Chikira_Sugiyama/cs_conv_pre.meta index 2decd5f8b..7ce80496b 100644 --- a/physics/cs_conv_pre.meta +++ b/physics/CONV/Chikira_Sugiyama/cs_conv_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cs_conv_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_gf_deep.F90 b/physics/CONV/Grell_Freitas/cu_gf_deep.F90 similarity index 100% rename from physics/cu_gf_deep.F90 rename to physics/CONV/Grell_Freitas/cu_gf_deep.F90 diff --git a/physics/cu_gf_driver.F90 b/physics/CONV/Grell_Freitas/cu_gf_driver.F90 similarity index 100% rename from physics/cu_gf_driver.F90 rename to physics/CONV/Grell_Freitas/cu_gf_driver.F90 diff --git a/physics/cu_gf_driver.meta b/physics/CONV/Grell_Freitas/cu_gf_driver.meta similarity index 99% rename from physics/cu_gf_driver.meta rename to physics/CONV/Grell_Freitas/cu_gf_driver.meta index 8b1a46e2d..d5324f05a 100644 --- a/physics/cu_gf_driver.meta +++ b/physics/CONV/Grell_Freitas/cu_gf_driver.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_gf_driver type = scheme - dependencies = cu_gf_deep.F90,cu_gf_sh.F90,machine.F,physcons.F90 + dependencies = cu_gf_deep.F90,cu_gf_sh.F90,../../hooks/machine.F,../../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_gf_driver_post.F90 b/physics/CONV/Grell_Freitas/cu_gf_driver_post.F90 similarity index 100% rename from physics/cu_gf_driver_post.F90 rename to physics/CONV/Grell_Freitas/cu_gf_driver_post.F90 diff --git a/physics/cu_gf_driver_post.meta b/physics/CONV/Grell_Freitas/cu_gf_driver_post.meta similarity index 98% rename from physics/cu_gf_driver_post.meta rename to physics/CONV/Grell_Freitas/cu_gf_driver_post.meta index 48e762cb4..fe2308b1b 100644 --- a/physics/cu_gf_driver_post.meta +++ b/physics/CONV/Grell_Freitas/cu_gf_driver_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_gf_driver_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_gf_driver_pre.F90 b/physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90 similarity index 100% rename from physics/cu_gf_driver_pre.F90 rename to physics/CONV/Grell_Freitas/cu_gf_driver_pre.F90 diff --git a/physics/cu_gf_driver_pre.meta b/physics/CONV/Grell_Freitas/cu_gf_driver_pre.meta similarity index 98% rename from physics/cu_gf_driver_pre.meta rename to physics/CONV/Grell_Freitas/cu_gf_driver_pre.meta index 7fd66d19b..5139cae6d 100644 --- a/physics/cu_gf_driver_pre.meta +++ b/physics/CONV/Grell_Freitas/cu_gf_driver_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_gf_driver_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_gf_sh.F90 b/physics/CONV/Grell_Freitas/cu_gf_sh.F90 similarity index 100% rename from physics/cu_gf_sh.F90 rename to physics/CONV/Grell_Freitas/cu_gf_sh.F90 diff --git a/physics/rascnv.F90 b/physics/CONV/RAS/rascnv.F90 similarity index 100% rename from physics/rascnv.F90 rename to physics/CONV/RAS/rascnv.F90 diff --git a/physics/rascnv.meta b/physics/CONV/RAS/rascnv.meta similarity index 99% rename from physics/rascnv.meta rename to physics/CONV/RAS/rascnv.meta index 5285c830f..f5a707ded 100644 --- a/physics/rascnv.meta +++ b/physics/CONV/RAS/rascnv.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rascnv type = scheme - dependencies = funcphys.f90,machine.F + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/samfaerosols.F b/physics/CONV/SAMF/samfaerosols.F similarity index 100% rename from physics/samfaerosols.F rename to physics/CONV/SAMF/samfaerosols.F diff --git a/physics/samfdeepcnv.f b/physics/CONV/SAMF/samfdeepcnv.f similarity index 100% rename from physics/samfdeepcnv.f rename to physics/CONV/SAMF/samfdeepcnv.f diff --git a/physics/samfdeepcnv.meta b/physics/CONV/SAMF/samfdeepcnv.meta similarity index 99% rename from physics/samfdeepcnv.meta rename to physics/CONV/SAMF/samfdeepcnv.meta index bed4d655d..ec9157ef3 100644 --- a/physics/samfdeepcnv.meta +++ b/physics/CONV/SAMF/samfdeepcnv.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = samfdeepcnv type = scheme - dependencies = funcphys.f90,machine.F,samfaerosols.F,progsigma_calc.f90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,samfaerosols.F,../progsigma_calc.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/samfshalcnv.f b/physics/CONV/SAMF/samfshalcnv.f similarity index 100% rename from physics/samfshalcnv.f rename to physics/CONV/SAMF/samfshalcnv.f diff --git a/physics/samfshalcnv.meta b/physics/CONV/SAMF/samfshalcnv.meta similarity index 99% rename from physics/samfshalcnv.meta rename to physics/CONV/SAMF/samfshalcnv.meta index c1fffef58..aab66d625 100644 --- a/physics/samfshalcnv.meta +++ b/physics/CONV/SAMF/samfshalcnv.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = samfshalcnv type = scheme - dependencies = funcphys.f90,machine.F,samfaerosols.F,progsigma_calc.f90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,samfaerosols.F,../progsigma_calc.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/sascnvn.F b/physics/CONV/SAS/sascnvn.F similarity index 100% rename from physics/sascnvn.F rename to physics/CONV/SAS/sascnvn.F diff --git a/physics/sascnvn.meta b/physics/CONV/SAS/sascnvn.meta similarity index 99% rename from physics/sascnvn.meta rename to physics/CONV/SAS/sascnvn.meta index 66e5161ad..fefa2823a 100644 --- a/physics/sascnvn.meta +++ b/physics/CONV/SAS/sascnvn.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sascnvn type = scheme - dependencies = funcphys.f90,machine.F + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/shalcnv.F b/physics/CONV/SAS/shalcnv.F similarity index 100% rename from physics/shalcnv.F rename to physics/CONV/SAS/shalcnv.F diff --git a/physics/shalcnv.meta b/physics/CONV/SAS/shalcnv.meta similarity index 99% rename from physics/shalcnv.meta rename to physics/CONV/SAS/shalcnv.meta index f554201c5..15324ed08 100644 --- a/physics/shalcnv.meta +++ b/physics/CONV/SAS/shalcnv.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = shalcnv type = scheme - dependencies = funcphys.f90,machine.F + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_ntiedtke.F90 b/physics/CONV/nTiedtke/cu_ntiedtke.F90 similarity index 100% rename from physics/cu_ntiedtke.F90 rename to physics/CONV/nTiedtke/cu_ntiedtke.F90 diff --git a/physics/cu_ntiedtke.meta b/physics/CONV/nTiedtke/cu_ntiedtke.meta similarity index 99% rename from physics/cu_ntiedtke.meta rename to physics/CONV/nTiedtke/cu_ntiedtke.meta index dded8fb20..b425a80ad 100644 --- a/physics/cu_ntiedtke.meta +++ b/physics/CONV/nTiedtke/cu_ntiedtke.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_ntiedtke type = scheme - dependencies = machine.F,physcons.F90 + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_ntiedtke_post.F90 b/physics/CONV/nTiedtke/cu_ntiedtke_post.F90 similarity index 100% rename from physics/cu_ntiedtke_post.F90 rename to physics/CONV/nTiedtke/cu_ntiedtke_post.F90 diff --git a/physics/cu_ntiedtke_post.meta b/physics/CONV/nTiedtke/cu_ntiedtke_post.meta similarity index 97% rename from physics/cu_ntiedtke_post.meta rename to physics/CONV/nTiedtke/cu_ntiedtke_post.meta index 703d32b90..9960b6b77 100644 --- a/physics/cu_ntiedtke_post.meta +++ b/physics/CONV/nTiedtke/cu_ntiedtke_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_ntiedtke_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cu_ntiedtke_pre.F90 b/physics/CONV/nTiedtke/cu_ntiedtke_pre.F90 similarity index 100% rename from physics/cu_ntiedtke_pre.F90 rename to physics/CONV/nTiedtke/cu_ntiedtke_pre.F90 diff --git a/physics/cu_ntiedtke_pre.meta b/physics/CONV/nTiedtke/cu_ntiedtke_pre.meta similarity index 98% rename from physics/cu_ntiedtke_pre.meta rename to physics/CONV/nTiedtke/cu_ntiedtke_pre.meta index ccb9b7f48..26392f0e6 100644 --- a/physics/cu_ntiedtke_pre.meta +++ b/physics/CONV/nTiedtke/cu_ntiedtke_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cu_ntiedtke_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/progsigma_calc.f90 b/physics/CONV/progsigma_calc.f90 similarity index 100% rename from physics/progsigma_calc.f90 rename to physics/CONV/progsigma_calc.f90 diff --git a/physics/cires_orowam2017.f b/physics/GWD/cires_orowam2017.f similarity index 100% rename from physics/cires_orowam2017.f rename to physics/GWD/cires_orowam2017.f diff --git a/physics/cires_tauamf_data.F90 b/physics/GWD/cires_tauamf_data.F90 similarity index 100% rename from physics/cires_tauamf_data.F90 rename to physics/GWD/cires_tauamf_data.F90 diff --git a/physics/cires_ugwp.F90 b/physics/GWD/cires_ugwp.F90 similarity index 100% rename from physics/cires_ugwp.F90 rename to physics/GWD/cires_ugwp.F90 diff --git a/physics/cires_ugwp.meta b/physics/GWD/cires_ugwp.meta similarity index 99% rename from physics/cires_ugwp.meta rename to physics/GWD/cires_ugwp.meta index d944a635e..cd0192ca7 100644 --- a/physics/cires_ugwp.meta +++ b/physics/GWD/cires_ugwp.meta @@ -3,7 +3,7 @@ type = scheme # DH* 20200804 - this is a result of the nasty hack to call gwdps from within ugwp-v0! dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90 - dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,machine.F,ugwp_driver_v0.F + dependencies=cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,../hooks/machine.F,ugwp_driver_v0.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cires_ugwp_initialize.F90 b/physics/GWD/cires_ugwp_initialize.F90 similarity index 100% rename from physics/cires_ugwp_initialize.F90 rename to physics/GWD/cires_ugwp_initialize.F90 diff --git a/physics/cires_ugwp_module.F90 b/physics/GWD/cires_ugwp_module.F90 similarity index 100% rename from physics/cires_ugwp_module.F90 rename to physics/GWD/cires_ugwp_module.F90 diff --git a/physics/cires_ugwp_post.F90 b/physics/GWD/cires_ugwp_post.F90 similarity index 100% rename from physics/cires_ugwp_post.F90 rename to physics/GWD/cires_ugwp_post.F90 diff --git a/physics/cires_ugwp_post.meta b/physics/GWD/cires_ugwp_post.meta similarity index 99% rename from physics/cires_ugwp_post.meta rename to physics/GWD/cires_ugwp_post.meta index 5add9d43f..dabc40082 100644 --- a/physics/cires_ugwp_post.meta +++ b/physics/GWD/cires_ugwp_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cires_ugwp_post type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/cires_ugwp_triggers.F90 b/physics/GWD/cires_ugwp_triggers.F90 similarity index 100% rename from physics/cires_ugwp_triggers.F90 rename to physics/GWD/cires_ugwp_triggers.F90 diff --git a/physics/cires_ugwpv1_initialize.F90 b/physics/GWD/cires_ugwpv1_initialize.F90 similarity index 100% rename from physics/cires_ugwpv1_initialize.F90 rename to physics/GWD/cires_ugwpv1_initialize.F90 diff --git a/physics/cires_ugwpv1_module.F90 b/physics/GWD/cires_ugwpv1_module.F90 similarity index 100% rename from physics/cires_ugwpv1_module.F90 rename to physics/GWD/cires_ugwpv1_module.F90 diff --git a/physics/cires_ugwpv1_oro.F90 b/physics/GWD/cires_ugwpv1_oro.F90 similarity index 100% rename from physics/cires_ugwpv1_oro.F90 rename to physics/GWD/cires_ugwpv1_oro.F90 diff --git a/physics/cires_ugwpv1_solv2.F90 b/physics/GWD/cires_ugwpv1_solv2.F90 similarity index 100% rename from physics/cires_ugwpv1_solv2.F90 rename to physics/GWD/cires_ugwpv1_solv2.F90 diff --git a/physics/cires_ugwpv1_sporo.F90 b/physics/GWD/cires_ugwpv1_sporo.F90 similarity index 100% rename from physics/cires_ugwpv1_sporo.F90 rename to physics/GWD/cires_ugwpv1_sporo.F90 diff --git a/physics/cires_ugwpv1_triggers.F90 b/physics/GWD/cires_ugwpv1_triggers.F90 similarity index 100% rename from physics/cires_ugwpv1_triggers.F90 rename to physics/GWD/cires_ugwpv1_triggers.F90 diff --git a/physics/drag_suite.F90 b/physics/GWD/drag_suite.F90 similarity index 100% rename from physics/drag_suite.F90 rename to physics/GWD/drag_suite.F90 diff --git a/physics/drag_suite.meta b/physics/GWD/drag_suite.meta similarity index 99% rename from physics/drag_suite.meta rename to physics/GWD/drag_suite.meta index 66f320b98..94dddcc93 100644 --- a/physics/drag_suite.meta +++ b/physics/GWD/drag_suite.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = drag_suite type = scheme - dependencies = + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/gwdc.f b/physics/GWD/gwdc.f similarity index 100% rename from physics/gwdc.f rename to physics/GWD/gwdc.f diff --git a/physics/gwdc.meta b/physics/GWD/gwdc.meta similarity index 99% rename from physics/gwdc.meta rename to physics/GWD/gwdc.meta index 341879b0b..9884d8a62 100644 --- a/physics/gwdc.meta +++ b/physics/GWD/gwdc.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = gwdc type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/gwdc_post.f b/physics/GWD/gwdc_post.f similarity index 100% rename from physics/gwdc_post.f rename to physics/GWD/gwdc_post.f diff --git a/physics/gwdc_post.meta b/physics/GWD/gwdc_post.meta similarity index 99% rename from physics/gwdc_post.meta rename to physics/GWD/gwdc_post.meta index 25415b888..97649d4cf 100644 --- a/physics/gwdc_post.meta +++ b/physics/GWD/gwdc_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = gwdc_post type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/gwdc_pre.f b/physics/GWD/gwdc_pre.f similarity index 100% rename from physics/gwdc_pre.f rename to physics/GWD/gwdc_pre.f diff --git a/physics/gwdc_pre.meta b/physics/GWD/gwdc_pre.meta similarity index 99% rename from physics/gwdc_pre.meta rename to physics/GWD/gwdc_pre.meta index 63df59cfa..55b0054bd 100644 --- a/physics/gwdc_pre.meta +++ b/physics/GWD/gwdc_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = gwdc_pre type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/gwdps.f b/physics/GWD/gwdps.f similarity index 100% rename from physics/gwdps.f rename to physics/GWD/gwdps.f diff --git a/physics/gwdps.meta b/physics/GWD/gwdps.meta similarity index 99% rename from physics/gwdps.meta rename to physics/GWD/gwdps.meta index af60886ab..bbe7569d0 100644 --- a/physics/gwdps.meta +++ b/physics/GWD/gwdps.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = gwdps type = scheme - dependencies = + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/rayleigh_damp.f b/physics/GWD/rayleigh_damp.f similarity index 100% rename from physics/rayleigh_damp.f rename to physics/GWD/rayleigh_damp.f diff --git a/physics/rayleigh_damp.meta b/physics/GWD/rayleigh_damp.meta similarity index 99% rename from physics/rayleigh_damp.meta rename to physics/GWD/rayleigh_damp.meta index 63025bcff..525acbe8b 100644 --- a/physics/rayleigh_damp.meta +++ b/physics/GWD/rayleigh_damp.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rayleigh_damp type = scheme - dependencies = + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/ugwp_driver_v0.F b/physics/GWD/ugwp_driver_v0.F similarity index 100% rename from physics/ugwp_driver_v0.F rename to physics/GWD/ugwp_driver_v0.F diff --git a/physics/ugwpv1_gsldrag.F90 b/physics/GWD/ugwpv1_gsldrag.F90 similarity index 100% rename from physics/ugwpv1_gsldrag.F90 rename to physics/GWD/ugwpv1_gsldrag.F90 diff --git a/physics/ugwpv1_gsldrag.meta b/physics/GWD/ugwpv1_gsldrag.meta similarity index 99% rename from physics/ugwpv1_gsldrag.meta rename to physics/GWD/ugwpv1_gsldrag.meta index 82caa8832..73d7eee1c 100644 --- a/physics/ugwpv1_gsldrag.meta +++ b/physics/GWD/ugwpv1_gsldrag.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ugwpv1_gsldrag type = scheme - dependencies = machine.F,drag_suite.F90 + dependencies = ../hooks/machine.F,drag_suite.F90 dependencies = cires_ugwpv1_module.F90,cires_ugwpv1_triggers.F90,cires_ugwpv1_initialize.F90,cires_ugwpv1_solv2.F90 dependencies = cires_ugwpv1_sporo.F90,cires_ugwpv1_oro.F90 ######################################################################## diff --git a/physics/ugwpv1_gsldrag_post.F90 b/physics/GWD/ugwpv1_gsldrag_post.F90 similarity index 100% rename from physics/ugwpv1_gsldrag_post.F90 rename to physics/GWD/ugwpv1_gsldrag_post.F90 diff --git a/physics/ugwpv1_gsldrag_post.meta b/physics/GWD/ugwpv1_gsldrag_post.meta similarity index 99% rename from physics/ugwpv1_gsldrag_post.meta rename to physics/GWD/ugwpv1_gsldrag_post.meta index f8766060c..e1c63102d 100644 --- a/physics/ugwpv1_gsldrag_post.meta +++ b/physics/GWD/ugwpv1_gsldrag_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ugwpv1_gsldrag_post type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/unified_ugwp.F90 b/physics/GWD/unified_ugwp.F90 similarity index 100% rename from physics/unified_ugwp.F90 rename to physics/GWD/unified_ugwp.F90 diff --git a/physics/unified_ugwp.meta b/physics/GWD/unified_ugwp.meta similarity index 99% rename from physics/unified_ugwp.meta rename to physics/GWD/unified_ugwp.meta index 8af99957a..a08ee3960 100644 --- a/physics/unified_ugwp.meta +++ b/physics/GWD/unified_ugwp.meta @@ -1,10 +1,10 @@ [ccpp-table-properties] name = unified_ugwp type = scheme - - dependencies=cires_ugwp_triggers.F90,cires_ugwp_initialize.F90 - dependencies=cires_orowam2017.f, cires_ugwp_module.F90,gwdps.f,machine.F,ugwp_driver_v0.F - dependencies=drag_suite.F90 + dependencies = ../hooks/machine.F + dependencies = cires_ugwp_triggers.F90,cires_ugwp_initialize.F90 + dependencies = cires_orowam2017.f,cires_ugwp_module.F90,gwdps.f,ugwp_driver_v0.F + dependencies = drag_suite.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/unified_ugwp_post.F90 b/physics/GWD/unified_ugwp_post.F90 similarity index 100% rename from physics/unified_ugwp_post.F90 rename to physics/GWD/unified_ugwp_post.F90 diff --git a/physics/unified_ugwp_post.meta b/physics/GWD/unified_ugwp_post.meta similarity index 99% rename from physics/unified_ugwp_post.meta rename to physics/GWD/unified_ugwp_post.meta index 6da6342df..7784c28ec 100644 --- a/physics/unified_ugwp_post.meta +++ b/physics/GWD/unified_ugwp_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = unified_ugwp_post type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_DCNV_generic_post.F90 b/physics/Interstitials/GFS/GFS_DCNV_generic_post.F90 similarity index 100% rename from physics/GFS_DCNV_generic_post.F90 rename to physics/Interstitials/GFS/GFS_DCNV_generic_post.F90 diff --git a/physics/GFS_DCNV_generic_post.meta b/physics/Interstitials/GFS/GFS_DCNV_generic_post.meta similarity index 99% rename from physics/GFS_DCNV_generic_post.meta rename to physics/Interstitials/GFS/GFS_DCNV_generic_post.meta index 8428752ce..359e580fe 100644 --- a/physics/GFS_DCNV_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_DCNV_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_DCNV_generic_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_DCNV_generic_pre.F90 b/physics/Interstitials/GFS/GFS_DCNV_generic_pre.F90 similarity index 100% rename from physics/GFS_DCNV_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_DCNV_generic_pre.F90 diff --git a/physics/GFS_DCNV_generic_pre.meta b/physics/Interstitials/GFS/GFS_DCNV_generic_pre.meta similarity index 99% rename from physics/GFS_DCNV_generic_pre.meta rename to physics/Interstitials/GFS/GFS_DCNV_generic_pre.meta index ee2050926..46de572f0 100644 --- a/physics/GFS_DCNV_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_DCNV_generic_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_DCNV_generic_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_GWD_generic_post.F90 b/physics/Interstitials/GFS/GFS_GWD_generic_post.F90 similarity index 100% rename from physics/GFS_GWD_generic_post.F90 rename to physics/Interstitials/GFS/GFS_GWD_generic_post.F90 diff --git a/physics/GFS_GWD_generic_post.meta b/physics/Interstitials/GFS/GFS_GWD_generic_post.meta similarity index 99% rename from physics/GFS_GWD_generic_post.meta rename to physics/Interstitials/GFS/GFS_GWD_generic_post.meta index 204c16c84..beca39282 100644 --- a/physics/GFS_GWD_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_GWD_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_GWD_generic_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_GWD_generic_pre.F90 b/physics/Interstitials/GFS/GFS_GWD_generic_pre.F90 similarity index 100% rename from physics/GFS_GWD_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_GWD_generic_pre.F90 diff --git a/physics/GFS_GWD_generic_pre.meta b/physics/Interstitials/GFS/GFS_GWD_generic_pre.meta similarity index 99% rename from physics/GFS_GWD_generic_pre.meta rename to physics/Interstitials/GFS/GFS_GWD_generic_pre.meta index 9bcc03300..dbbfc261d 100644 --- a/physics/GFS_GWD_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_GWD_generic_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_GWD_generic_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_MP_generic_post.F90 b/physics/Interstitials/GFS/GFS_MP_generic_post.F90 similarity index 100% rename from physics/GFS_MP_generic_post.F90 rename to physics/Interstitials/GFS/GFS_MP_generic_post.F90 diff --git a/physics/GFS_MP_generic_post.meta b/physics/Interstitials/GFS/GFS_MP_generic_post.meta similarity index 99% rename from physics/GFS_MP_generic_post.meta rename to physics/Interstitials/GFS/GFS_MP_generic_post.meta index 7cd2ca4b5..0ac5c4527 100644 --- a/physics/GFS_MP_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_MP_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_MP_generic_post type = scheme - dependencies = calpreciptype.f90,machine.F + dependencies = ../../MP/calpreciptype.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_MP_generic_pre.F90 b/physics/Interstitials/GFS/GFS_MP_generic_pre.F90 similarity index 100% rename from physics/GFS_MP_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_MP_generic_pre.F90 diff --git a/physics/GFS_MP_generic_pre.meta b/physics/Interstitials/GFS/GFS_MP_generic_pre.meta similarity index 98% rename from physics/GFS_MP_generic_pre.meta rename to physics/Interstitials/GFS/GFS_MP_generic_pre.meta index a2a4947ef..6d5fd1538 100644 --- a/physics/GFS_MP_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_MP_generic_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_MP_generic_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_PBL_generic_common.F90 b/physics/Interstitials/GFS/GFS_PBL_generic_common.F90 similarity index 100% rename from physics/GFS_PBL_generic_common.F90 rename to physics/Interstitials/GFS/GFS_PBL_generic_common.F90 diff --git a/physics/GFS_PBL_generic_post.F90 b/physics/Interstitials/GFS/GFS_PBL_generic_post.F90 similarity index 100% rename from physics/GFS_PBL_generic_post.F90 rename to physics/Interstitials/GFS/GFS_PBL_generic_post.F90 diff --git a/physics/GFS_PBL_generic_post.meta b/physics/Interstitials/GFS/GFS_PBL_generic_post.meta similarity index 99% rename from physics/GFS_PBL_generic_post.meta rename to physics/Interstitials/GFS/GFS_PBL_generic_post.meta index b20142991..53a769c49 100644 --- a/physics/GFS_PBL_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_PBL_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_PBL_generic_post type = scheme - dependencies = GFS_PBL_generic_common.F90,machine.F + dependencies = GFS_PBL_generic_common.F90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_PBL_generic_pre.F90 b/physics/Interstitials/GFS/GFS_PBL_generic_pre.F90 similarity index 100% rename from physics/GFS_PBL_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_PBL_generic_pre.F90 diff --git a/physics/GFS_PBL_generic_pre.meta b/physics/Interstitials/GFS/GFS_PBL_generic_pre.meta similarity index 99% rename from physics/GFS_PBL_generic_pre.meta rename to physics/Interstitials/GFS/GFS_PBL_generic_pre.meta index a09b34b48..0377582a4 100644 --- a/physics/GFS_PBL_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_PBL_generic_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_PBL_generic_pre type = scheme - dependencies = GFS_PBL_generic_common.F90,machine.F + dependencies = GFS_PBL_generic_common.F90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_SCNV_generic_post.F90 b/physics/Interstitials/GFS/GFS_SCNV_generic_post.F90 similarity index 100% rename from physics/GFS_SCNV_generic_post.F90 rename to physics/Interstitials/GFS/GFS_SCNV_generic_post.F90 diff --git a/physics/GFS_SCNV_generic_post.meta b/physics/Interstitials/GFS/GFS_SCNV_generic_post.meta similarity index 99% rename from physics/GFS_SCNV_generic_post.meta rename to physics/Interstitials/GFS/GFS_SCNV_generic_post.meta index bf6ba394f..963ad4a81 100644 --- a/physics/GFS_SCNV_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_SCNV_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_SCNV_generic_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_SCNV_generic_pre.F90 b/physics/Interstitials/GFS/GFS_SCNV_generic_pre.F90 similarity index 100% rename from physics/GFS_SCNV_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_SCNV_generic_pre.F90 diff --git a/physics/GFS_SCNV_generic_pre.meta b/physics/Interstitials/GFS/GFS_SCNV_generic_pre.meta similarity index 99% rename from physics/GFS_SCNV_generic_pre.meta rename to physics/Interstitials/GFS/GFS_SCNV_generic_pre.meta index eccd547a1..fbd9e47d8 100644 --- a/physics/GFS_SCNV_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_SCNV_generic_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_SCNV_generic_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_cloud_diagnostics.F90 b/physics/Interstitials/GFS/GFS_cloud_diagnostics.F90 similarity index 100% rename from physics/GFS_cloud_diagnostics.F90 rename to physics/Interstitials/GFS/GFS_cloud_diagnostics.F90 diff --git a/physics/GFS_cloud_diagnostics.meta b/physics/Interstitials/GFS/GFS_cloud_diagnostics.meta similarity index 98% rename from physics/GFS_cloud_diagnostics.meta rename to physics/Interstitials/GFS/GFS_cloud_diagnostics.meta index 53d1552e6..576c66463 100644 --- a/physics/GFS_cloud_diagnostics.meta +++ b/physics/Interstitials/GFS/GFS_cloud_diagnostics.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_cloud_diagnostics type = scheme - dependencies = machine.F,radiation_clouds.f + relative_path = ../../ + dependencies = hooks/machine.F,Radiation/radiation_clouds.f ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_debug.F90 b/physics/Interstitials/GFS/GFS_debug.F90 similarity index 100% rename from physics/GFS_debug.F90 rename to physics/Interstitials/GFS/GFS_debug.F90 diff --git a/physics/GFS_debug.meta b/physics/Interstitials/GFS/GFS_debug.meta similarity index 99% rename from physics/GFS_debug.meta rename to physics/Interstitials/GFS/GFS_debug.meta index 1ad24e1d6..de3f49a6f 100644 --- a/physics/GFS_debug.meta +++ b/physics/Interstitials/GFS/GFS_debug.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_diagtoscreen type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_phys_time_vary.fv3.F90 b/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.F90 similarity index 100% rename from physics/GFS_phys_time_vary.fv3.F90 rename to physics/Interstitials/GFS/GFS_phys_time_vary.fv3.F90 diff --git a/physics/GFS_phys_time_vary.fv3.meta b/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta similarity index 98% rename from physics/GFS_phys_time_vary.fv3.meta rename to physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta index 363469e91..45125385c 100644 --- a/physics/GFS_phys_time_vary.fv3.meta +++ b/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta @@ -1,8 +1,15 @@ [ccpp-table-properties] name = GFS_phys_time_vary type = scheme - dependencies = aerclm_def.F,aerinterp.F90,gcycle.F90,h2o_def.f,h2ointerp.f90,iccn_def.F,iccninterp.F90,machine.F,mersenne_twister.f - dependencies = namelist_soilveg.f,set_soilveg.f,ozinterp.f90,ozne_def.f,sfcsub.F,cires_tauamf_data.F90,noahmp_tables.f90 + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Interstitials/GFS/gcycle.F90,Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F + dependencies = Radiation/mersenne_twister.f + dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 + dependencies = Land/namelist_soilveg.f,Land/set_soilveg.f,Land/Noahmp/noahmp_tables.f90 + dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f + dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 + dependencies = GWD/cires_tauamf_data.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_phys_time_vary.scm.F90 b/physics/Interstitials/GFS/GFS_phys_time_vary.scm.F90 similarity index 100% rename from physics/GFS_phys_time_vary.scm.F90 rename to physics/Interstitials/GFS/GFS_phys_time_vary.scm.F90 diff --git a/physics/GFS_phys_time_vary.scm.meta b/physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta similarity index 98% rename from physics/GFS_phys_time_vary.scm.meta rename to physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta index 8b59e4bed..84f22aede 100644 --- a/physics/GFS_phys_time_vary.scm.meta +++ b/physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta @@ -1,8 +1,15 @@ [ccpp-table-properties] name = GFS_phys_time_vary type = scheme - dependencies = aerclm_def.F,aerinterp.F90,h2o_def.f,h2ointerp.f90,iccn_def.F,iccninterp.F90,machine.F,mersenne_twister.f - dependencies = namelist_soilveg.f,set_soilveg.f,ozinterp.f90,ozne_def.f,cires_tauamf_data.F90,noahmp_tables.f90 + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F + dependencies = Radiation/mersenne_twister.f + dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 + dependencies = Land/namelist_soilveg.f,Land/set_soilveg.f,Land/Noahmp/noahmp_tables.f90 + dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f + dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 + dependencies = GWD/cires_tauamf_data.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rad_time_vary.fv3.F90 b/physics/Interstitials/GFS/GFS_rad_time_vary.fv3.F90 similarity index 100% rename from physics/GFS_rad_time_vary.fv3.F90 rename to physics/Interstitials/GFS/GFS_rad_time_vary.fv3.F90 diff --git a/physics/GFS_rad_time_vary.fv3.meta b/physics/Interstitials/GFS/GFS_rad_time_vary.fv3.meta similarity index 98% rename from physics/GFS_rad_time_vary.fv3.meta rename to physics/Interstitials/GFS/GFS_rad_time_vary.fv3.meta index 19eb41dc2..0759b7e2a 100644 --- a/physics/GFS_rad_time_vary.fv3.meta +++ b/physics/Interstitials/GFS/GFS_rad_time_vary.fv3.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_rad_time_vary type = scheme - dependencies = machine.F,mersenne_twister.f,radcons.f90 + relative_path = ../../ + dependencies = hooks/machine.F,Radiation/mersenne_twister.f,Radiation/RRTMG/radcons.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rad_time_vary.scm.F90 b/physics/Interstitials/GFS/GFS_rad_time_vary.scm.F90 similarity index 100% rename from physics/GFS_rad_time_vary.scm.F90 rename to physics/Interstitials/GFS/GFS_rad_time_vary.scm.F90 diff --git a/physics/GFS_rad_time_vary.scm.meta b/physics/Interstitials/GFS/GFS_rad_time_vary.scm.meta similarity index 98% rename from physics/GFS_rad_time_vary.scm.meta rename to physics/Interstitials/GFS/GFS_rad_time_vary.scm.meta index 19eb41dc2..0759b7e2a 100644 --- a/physics/GFS_rad_time_vary.scm.meta +++ b/physics/Interstitials/GFS/GFS_rad_time_vary.scm.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_rad_time_vary type = scheme - dependencies = machine.F,mersenne_twister.f,radcons.f90 + relative_path = ../../ + dependencies = hooks/machine.F,Radiation/mersenne_twister.f,Radiation/RRTMG/radcons.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_radiation_surface.F90 b/physics/Interstitials/GFS/GFS_radiation_surface.F90 similarity index 100% rename from physics/GFS_radiation_surface.F90 rename to physics/Interstitials/GFS/GFS_radiation_surface.F90 diff --git a/physics/GFS_radiation_surface.meta b/physics/Interstitials/GFS/GFS_radiation_surface.meta similarity index 98% rename from physics/GFS_radiation_surface.meta rename to physics/Interstitials/GFS/GFS_radiation_surface.meta index 9d5734706..c18b81d9f 100644 --- a/physics/GFS_radiation_surface.meta +++ b/physics/Interstitials/GFS/GFS_radiation_surface.meta @@ -1,7 +1,10 @@ [ccpp-table-properties] name = GFS_radiation_surface type = scheme - dependencies = iounitdef.f,machine.F,radiation_surface.f,set_soilveg_ruc.F90,namelist_soilveg_ruc.F90 + relative_path = ../../ + dependencies = Radiation/iounitdef.f,Radiation/radiation_surface.f + dependencies = Land/RUC/set_soilveg_ruc.F90,Land/RUC/namelist_soilveg_ruc.F90 + dependencies = hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmg_post.F90 b/physics/Interstitials/GFS/GFS_rrtmg_post.F90 similarity index 100% rename from physics/GFS_rrtmg_post.F90 rename to physics/Interstitials/GFS/GFS_rrtmg_post.F90 diff --git a/physics/GFS_rrtmg_post.meta b/physics/Interstitials/GFS/GFS_rrtmg_post.meta similarity index 97% rename from physics/GFS_rrtmg_post.meta rename to physics/Interstitials/GFS/GFS_rrtmg_post.meta index 5fa6328a7..c84b9da31 100644 --- a/physics/GFS_rrtmg_post.meta +++ b/physics/Interstitials/GFS/GFS_rrtmg_post.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = GFS_rrtmg_post type = scheme - dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,radsw_param.f + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Radiation/iounitdef.f,Radiation/radiation_aerosols.f,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmg_pre.F90 b/physics/Interstitials/GFS/GFS_rrtmg_pre.F90 similarity index 100% rename from physics/GFS_rrtmg_pre.F90 rename to physics/Interstitials/GFS/GFS_rrtmg_pre.F90 diff --git a/physics/GFS_rrtmg_pre.meta b/physics/Interstitials/GFS/GFS_rrtmg_pre.meta similarity index 98% rename from physics/GFS_rrtmg_pre.meta rename to physics/Interstitials/GFS/GFS_rrtmg_pre.meta index a8aecdbe0..e0e67c8f5 100644 --- a/physics/GFS_rrtmg_pre.meta +++ b/physics/Interstitials/GFS/GFS_rrtmg_pre.meta @@ -1,9 +1,13 @@ [ccpp-table-properties] name = GFS_rrtmg_pre type = scheme - dependencies = funcphys.f90,iounitdef.f,machine.F,module_bfmicrophysics.f,module_mp_radar.F90,module_mp_thompson.F90 - dependencies = module_mp_thompson_make_number_concentrations.F90,radcons.f90,radiation_aerosols.f - dependencies = radiation_astronomy.f,radiation_clouds.f,radiation_gases.f,radlw_param.f,radsw_param.f,surface_perturbation.F90,radiation_cloud_overlap.F90 + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F + dependencies = MP/Thompson/module_mp_thompson.F90,MP/Thompsonmodule_mp_thompson_make_number_concentrations.F90 + dependencies = Radiation/iounitdef.f,Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f + dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f + dependencies = Radiation/radlw_param.f,Radiation/radsw_param.f,Radiation/radiation_cloud_overlap.F90 + dependencies = Land/Noah/surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmg_setup.F90 b/physics/Interstitials/GFS/GFS_rrtmg_setup.F90 similarity index 100% rename from physics/GFS_rrtmg_setup.F90 rename to physics/Interstitials/GFS/GFS_rrtmg_setup.F90 diff --git a/physics/GFS_rrtmg_setup.meta b/physics/Interstitials/GFS/GFS_rrtmg_setup.meta similarity index 97% rename from physics/GFS_rrtmg_setup.meta rename to physics/Interstitials/GFS/GFS_rrtmg_setup.meta index adf6d8750..0c199deaa 100644 --- a/physics/GFS_rrtmg_setup.meta +++ b/physics/Interstitials/GFS/GFS_rrtmg_setup.meta @@ -1,8 +1,12 @@ [ccpp-table-properties] name = GFS_rrtmg_setup type = scheme - dependencies = iounitdef.f,module_bfmicrophysics.f,radcons.f90,radiation_aerosols.f,radiation_astronomy.f,radiation_clouds.f - dependencies = module_mp_thompson.F90,radiation_gases.f,radlw_main.F90,radlw_param.f,radsw_main.F90,radsw_param.f,machine.F + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Radiaiton/iounitdef.f,Radiaiton/RRTMG/radcons.f90,Radiaiton/radiation_aerosols.f + dependencies = Radiaiton/radiation_astronomy.f,Radiaiton/radiation_clouds.f,Radiaiton/radiation_gases.f + dependencies = Radiaiton/radlw_main.F90,Radiaiton/radlw_param.f,Radiaiton/radsw_main.F90,Radiaiton/radsw_param.f + dependencies = MP/Thompson/module_mp_thompson.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmgp_cloud_mp.F90 b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.F90 similarity index 100% rename from physics/GFS_rrtmgp_cloud_mp.F90 rename to physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.F90 diff --git a/physics/GFS_rrtmgp_cloud_mp.meta b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.meta similarity index 98% rename from physics/GFS_rrtmgp_cloud_mp.meta rename to physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.meta index b782e73b4..f67259b87 100644 --- a/physics/GFS_rrtmgp_cloud_mp.meta +++ b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.meta @@ -1,7 +1,10 @@ [ccpp-table-properties] name = GFS_rrtmgp_cloud_mp type = scheme - dependencies = radiation_tools.F90, radiation_clouds.f, module_mp_thompson_make_number_concentrations.F90, module_mp_thompson.F90, rrtmgp_lw_cloud_optics.F90 + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Radiation/radiation_tools.F90,Radiation/radiation_clouds.f,Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90 + dependencies = MP/Thompson/module_mp_thompson_make_number_concentrations.F90,MP/Thompson/module_mp_thompson.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmgp_cloud_overlap.F90 b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.F90 similarity index 100% rename from physics/GFS_rrtmgp_cloud_overlap.F90 rename to physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.F90 diff --git a/physics/GFS_rrtmgp_cloud_overlap.meta b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.meta similarity index 98% rename from physics/GFS_rrtmgp_cloud_overlap.meta rename to physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.meta index cf6a05217..4d9af626d 100644 --- a/physics/GFS_rrtmgp_cloud_overlap.meta +++ b/physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = GFS_rrtmgp_cloud_overlap type = scheme - dependencies = radiation_tools.F90, radiation_cloud_overlap.F90 + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = Radiation/radiation_tools.F90,Radiation/radiation_cloud_overlap.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmgp_post.F90 b/physics/Interstitials/GFS/GFS_rrtmgp_post.F90 similarity index 100% rename from physics/GFS_rrtmgp_post.F90 rename to physics/Interstitials/GFS/GFS_rrtmgp_post.F90 diff --git a/physics/GFS_rrtmgp_post.meta b/physics/Interstitials/GFS/GFS_rrtmgp_post.meta similarity index 98% rename from physics/GFS_rrtmgp_post.meta rename to physics/Interstitials/GFS/GFS_rrtmgp_post.meta index e4bc3e5dc..c21c2ef7c 100644 --- a/physics/GFS_rrtmgp_post.meta +++ b/physics/Interstitials/GFS/GFS_rrtmgp_post.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = GFS_rrtmgp_post type = scheme - dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radlw_param.f,radiation_tools.F90,rte-rrtmgp/extensions/mo_heating_rates.F90 + relative_path = ../../ + dependencies = Radiation/iounitdef.f,hooks/machine.F,Radiation/radiation_aerosols.f + dependencies = Radiation/RRTMG/radlw_param.f,Radiation/radiation_tools.F90,Radiation/RRTMGP/rte-rrtmgp/extensions/mo_heating_rates.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmgp_pre.F90 b/physics/Interstitials/GFS/GFS_rrtmgp_pre.F90 similarity index 99% rename from physics/GFS_rrtmgp_pre.F90 rename to physics/Interstitials/GFS/GFS_rrtmgp_pre.F90 index 009eb8c38..b76f93659 100644 --- a/physics/GFS_rrtmgp_pre.F90 +++ b/physics/Interstitials/GFS/GFS_rrtmgp_pre.F90 @@ -9,7 +9,6 @@ module GFS_rrtmgp_pre use funcphys, only: fpvs use module_radiation_astronomy, only: coszmn use module_radiation_gases, only: NF_VGAS, getgases, getozn - use mo_gas_concentrations, only: ty_gas_concs use radiation_tools, only: check_error_msg,cmp_tlev use rrtmgp_lw_gas_optics, only: lw_gas_props diff --git a/physics/GFS_rrtmgp_pre.meta b/physics/Interstitials/GFS/GFS_rrtmgp_pre.meta similarity index 98% rename from physics/GFS_rrtmgp_pre.meta rename to physics/Interstitials/GFS/GFS_rrtmgp_pre.meta index abb07b825..ae67ef51b 100644 --- a/physics/GFS_rrtmgp_pre.meta +++ b/physics/Interstitials/GFS/GFS_rrtmgp_pre.meta @@ -1,8 +1,9 @@ [ccpp-table-properties] name = GFS_rrtmgp_pre type = scheme - dependencies = funcphys.f90,iounitdef.f,machine.F,module_bfmicrophysics.f,physcons.F90,radcons.f90,radiation_aerosols.f - dependencies = radiation_astronomy.f,radiation_gases.f,radiation_tools.F90,rrtmg_lw_cloud_optics.F90 + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F,Radiation/iounitdef.f,Radiation/radiation_aerosols.f + dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_gases.f,Radiation/radiation_tools.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_rrtmgp_setup.F90 b/physics/Interstitials/GFS/GFS_rrtmgp_setup.F90 similarity index 100% rename from physics/GFS_rrtmgp_setup.F90 rename to physics/Interstitials/GFS/GFS_rrtmgp_setup.F90 diff --git a/physics/GFS_rrtmgp_setup.meta b/physics/Interstitials/GFS/GFS_rrtmgp_setup.meta similarity index 97% rename from physics/GFS_rrtmgp_setup.meta rename to physics/Interstitials/GFS/GFS_rrtmgp_setup.meta index c4f7cfaa5..5d21e1910 100644 --- a/physics/GFS_rrtmgp_setup.meta +++ b/physics/Interstitials/GFS/GFS_rrtmgp_setup.meta @@ -1,8 +1,10 @@ [ccpp-table-properties] name = GFS_rrtmgp_setup type = scheme - dependencies = iounitdef.f,machine.F,module_bfmicrophysics.f,radiation_aerosols.f,radiation_astronomy.f - dependencies = module_mp_thompson.F90,radiation_gases.f + relative_path = ../../ + dependencies = hooks/machine.F,MP/Thompson/module_mp_thompson.F90 + dependencies = Radiation/iounitdef.f,Radiation/radiation_aerosols.f + dependencies = Radiation/radiation_gases.f,Radiation/radiation_astronomy.f ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_stochastics.F90 b/physics/Interstitials/GFS/GFS_stochastics.F90 similarity index 100% rename from physics/GFS_stochastics.F90 rename to physics/Interstitials/GFS/GFS_stochastics.F90 diff --git a/physics/GFS_stochastics.meta b/physics/Interstitials/GFS/GFS_stochastics.meta similarity index 99% rename from physics/GFS_stochastics.meta rename to physics/Interstitials/GFS/GFS_stochastics.meta index 796f4ddf7..6c55a09de 100644 --- a/physics/GFS_stochastics.meta +++ b/physics/Interstitials/GFS/GFS_stochastics.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_stochastics type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F [ccpp-arg-table] name = GFS_stochastics_init diff --git a/physics/GFS_suite_interstitial_1.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_1.F90 similarity index 100% rename from physics/GFS_suite_interstitial_1.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_1.F90 diff --git a/physics/GFS_suite_interstitial_1.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_1.meta similarity index 99% rename from physics/GFS_suite_interstitial_1.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_1.meta index a465ed320..295ffdf2e 100644 --- a/physics/GFS_suite_interstitial_1.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_1.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_1 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_2.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_2.F90 similarity index 100% rename from physics/GFS_suite_interstitial_2.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_2.F90 diff --git a/physics/GFS_suite_interstitial_2.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_2.meta similarity index 99% rename from physics/GFS_suite_interstitial_2.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_2.meta index 1f4300574..de4db5f9f 100644 --- a/physics/GFS_suite_interstitial_2.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_2.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_2 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_3.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_3.F90 similarity index 100% rename from physics/GFS_suite_interstitial_3.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_3.F90 diff --git a/physics/GFS_suite_interstitial_3.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_3.meta similarity index 99% rename from physics/GFS_suite_interstitial_3.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_3.meta index e8f9fe889..22f57e354 100644 --- a/physics/GFS_suite_interstitial_3.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_3.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_3 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_4.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_4.F90 similarity index 100% rename from physics/GFS_suite_interstitial_4.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_4.F90 diff --git a/physics/GFS_suite_interstitial_4.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_4.meta similarity index 98% rename from physics/GFS_suite_interstitial_4.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_4.meta index 92870d95f..c0df52f1a 100644 --- a/physics/GFS_suite_interstitial_4.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_4.meta @@ -2,7 +2,9 @@ [ccpp-table-properties] name = GFS_suite_interstitial_4 type = scheme - dependencies = machine.F,module_mp_thompson_make_number_concentrations.F90 + relative_path = ../../ + dependencies = hooks/machine.F + dependencies = MP/Thompson/module_mp_thompson_make_number_concentrations.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_5.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_5.F90 similarity index 100% rename from physics/GFS_suite_interstitial_5.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_5.F90 diff --git a/physics/GFS_suite_interstitial_5.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_5.meta similarity index 98% rename from physics/GFS_suite_interstitial_5.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_5.meta index 9d32160a1..511137901 100644 --- a/physics/GFS_suite_interstitial_5.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_5.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_5 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_phys_reset.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.F90 similarity index 100% rename from physics/GFS_suite_interstitial_phys_reset.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.F90 diff --git a/physics/GFS_suite_interstitial_phys_reset.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.meta similarity index 96% rename from physics/GFS_suite_interstitial_phys_reset.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.meta index adebbc833..947a1950f 100644 --- a/physics/GFS_suite_interstitial_phys_reset.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_phys_reset type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_interstitial_rad_reset.F90 b/physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.F90 similarity index 100% rename from physics/GFS_suite_interstitial_rad_reset.F90 rename to physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.F90 diff --git a/physics/GFS_suite_interstitial_rad_reset.meta b/physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.meta similarity index 96% rename from physics/GFS_suite_interstitial_rad_reset.meta rename to physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.meta index 91fd8cba7..aaaff02f5 100644 --- a/physics/GFS_suite_interstitial_rad_reset.meta +++ b/physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_suite_interstitial_rad_reset type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_stateout_reset.F90 b/physics/Interstitials/GFS/GFS_suite_stateout_reset.F90 similarity index 100% rename from physics/GFS_suite_stateout_reset.F90 rename to physics/Interstitials/GFS/GFS_suite_stateout_reset.F90 diff --git a/physics/GFS_suite_stateout_reset.meta b/physics/Interstitials/GFS/GFS_suite_stateout_reset.meta similarity index 98% rename from physics/GFS_suite_stateout_reset.meta rename to physics/Interstitials/GFS/GFS_suite_stateout_reset.meta index fa4111e6b..b84d10691 100644 --- a/physics/GFS_suite_stateout_reset.meta +++ b/physics/Interstitials/GFS/GFS_suite_stateout_reset.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_stateout_reset type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_suite_stateout_update.F90 b/physics/Interstitials/GFS/GFS_suite_stateout_update.F90 similarity index 100% rename from physics/GFS_suite_stateout_update.F90 rename to physics/Interstitials/GFS/GFS_suite_stateout_update.F90 diff --git a/physics/GFS_suite_stateout_update.meta b/physics/Interstitials/GFS/GFS_suite_stateout_update.meta similarity index 99% rename from physics/GFS_suite_stateout_update.meta rename to physics/Interstitials/GFS/GFS_suite_stateout_update.meta index 580482b71..8a0d784f2 100644 --- a/physics/GFS_suite_stateout_update.meta +++ b/physics/Interstitials/GFS/GFS_suite_stateout_update.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_suite_stateout_update type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_composites_inter.F90 b/physics/Interstitials/GFS/GFS_surface_composites_inter.F90 similarity index 100% rename from physics/GFS_surface_composites_inter.F90 rename to physics/Interstitials/GFS/GFS_surface_composites_inter.F90 diff --git a/physics/GFS_surface_composites_inter.meta b/physics/Interstitials/GFS/GFS_surface_composites_inter.meta similarity index 99% rename from physics/GFS_surface_composites_inter.meta rename to physics/Interstitials/GFS/GFS_surface_composites_inter.meta index 36af0ef5a..ef3005583 100644 --- a/physics/GFS_surface_composites_inter.meta +++ b/physics/Interstitials/GFS/GFS_surface_composites_inter.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_surface_composites_inter type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_composites_post.F90 b/physics/Interstitials/GFS/GFS_surface_composites_post.F90 similarity index 100% rename from physics/GFS_surface_composites_post.F90 rename to physics/Interstitials/GFS/GFS_surface_composites_post.F90 diff --git a/physics/GFS_surface_composites_post.meta b/physics/Interstitials/GFS/GFS_surface_composites_post.meta similarity index 99% rename from physics/GFS_surface_composites_post.meta rename to physics/Interstitials/GFS/GFS_surface_composites_post.meta index a78610cc7..35b54544a 100644 --- a/physics/GFS_surface_composites_post.meta +++ b/physics/Interstitials/GFS/GFS_surface_composites_post.meta @@ -2,7 +2,8 @@ [ccpp-table-properties] name = GFS_surface_composites_post type = scheme - dependencies = machine.F,sfc_diff.f + relative_path = ../../ + dependencies = hooks/machine.F,SFC_Layer/GFS_sfc/sfc_diff.f ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_composites_pre.F90 b/physics/Interstitials/GFS/GFS_surface_composites_pre.F90 similarity index 100% rename from physics/GFS_surface_composites_pre.F90 rename to physics/Interstitials/GFS/GFS_surface_composites_pre.F90 diff --git a/physics/GFS_surface_composites_pre.meta b/physics/Interstitials/GFS/GFS_surface_composites_pre.meta similarity index 99% rename from physics/GFS_surface_composites_pre.meta rename to physics/Interstitials/GFS/GFS_surface_composites_pre.meta index d6b9003fe..33e2f0523 100644 --- a/physics/GFS_surface_composites_pre.meta +++ b/physics/Interstitials/GFS/GFS_surface_composites_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_surface_composites_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_generic_post.F90 b/physics/Interstitials/GFS/GFS_surface_generic_post.F90 similarity index 100% rename from physics/GFS_surface_generic_post.F90 rename to physics/Interstitials/GFS/GFS_surface_generic_post.F90 diff --git a/physics/GFS_surface_generic_post.meta b/physics/Interstitials/GFS/GFS_surface_generic_post.meta similarity index 99% rename from physics/GFS_surface_generic_post.meta rename to physics/Interstitials/GFS/GFS_surface_generic_post.meta index 9658be7d8..2c28b17d7 100644 --- a/physics/GFS_surface_generic_post.meta +++ b/physics/Interstitials/GFS/GFS_surface_generic_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_surface_generic_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_generic_pre.F90 b/physics/Interstitials/GFS/GFS_surface_generic_pre.F90 similarity index 100% rename from physics/GFS_surface_generic_pre.F90 rename to physics/Interstitials/GFS/GFS_surface_generic_pre.F90 diff --git a/physics/GFS_surface_generic_pre.meta b/physics/Interstitials/GFS/GFS_surface_generic_pre.meta similarity index 99% rename from physics/GFS_surface_generic_pre.meta rename to physics/Interstitials/GFS/GFS_surface_generic_pre.meta index d78988787..63fb9b96c 100644 --- a/physics/GFS_surface_generic_pre.meta +++ b/physics/Interstitials/GFS/GFS_surface_generic_pre.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_surface_generic_pre type = scheme - dependencies = machine.F,surface_perturbation.F90 + relative_path = ../../ + dependencies = hooks/machine.F,Land/Noah/surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_loop_control_part1.F90 b/physics/Interstitials/GFS/GFS_surface_loop_control_part1.F90 similarity index 100% rename from physics/GFS_surface_loop_control_part1.F90 rename to physics/Interstitials/GFS/GFS_surface_loop_control_part1.F90 diff --git a/physics/GFS_surface_loop_control_part1.meta b/physics/Interstitials/GFS/GFS_surface_loop_control_part1.meta similarity index 97% rename from physics/GFS_surface_loop_control_part1.meta rename to physics/Interstitials/GFS/GFS_surface_loop_control_part1.meta index f178320ee..4bf962f6e 100644 --- a/physics/GFS_surface_loop_control_part1.meta +++ b/physics/Interstitials/GFS/GFS_surface_loop_control_part1.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_surface_loop_control_part1 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_surface_loop_control_part2.F90 b/physics/Interstitials/GFS/GFS_surface_loop_control_part2.F90 similarity index 100% rename from physics/GFS_surface_loop_control_part2.F90 rename to physics/Interstitials/GFS/GFS_surface_loop_control_part2.F90 diff --git a/physics/GFS_surface_loop_control_part2.meta b/physics/Interstitials/GFS/GFS_surface_loop_control_part2.meta similarity index 98% rename from physics/GFS_surface_loop_control_part2.meta rename to physics/Interstitials/GFS/GFS_surface_loop_control_part2.meta index 7c9bc7408..ba19bf437 100644 --- a/physics/GFS_surface_loop_control_part2.meta +++ b/physics/Interstitials/GFS/GFS_surface_loop_control_part2.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = GFS_surface_loop_control_part2 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_time_vary_pre.fv3.F90 b/physics/Interstitials/GFS/GFS_time_vary_pre.fv3.F90 similarity index 100% rename from physics/GFS_time_vary_pre.fv3.F90 rename to physics/Interstitials/GFS/GFS_time_vary_pre.fv3.F90 diff --git a/physics/GFS_time_vary_pre.fv3.meta b/physics/Interstitials/GFS/GFS_time_vary_pre.fv3.meta similarity index 98% rename from physics/GFS_time_vary_pre.fv3.meta rename to physics/Interstitials/GFS/GFS_time_vary_pre.fv3.meta index 3ec92287a..c6dd95bce 100644 --- a/physics/GFS_time_vary_pre.fv3.meta +++ b/physics/Interstitials/GFS/GFS_time_vary_pre.fv3.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_time_vary_pre type = scheme - dependencies = funcphys.f90,machine.F + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/GFS_time_vary_pre.scm.F90 b/physics/Interstitials/GFS/GFS_time_vary_pre.scm.F90 similarity index 100% rename from physics/GFS_time_vary_pre.scm.F90 rename to physics/Interstitials/GFS/GFS_time_vary_pre.scm.F90 diff --git a/physics/GFS_time_vary_pre.scm.meta b/physics/Interstitials/GFS/GFS_time_vary_pre.scm.meta similarity index 98% rename from physics/GFS_time_vary_pre.scm.meta rename to physics/Interstitials/GFS/GFS_time_vary_pre.scm.meta index 20708c51e..af9afcdfe 100644 --- a/physics/GFS_time_vary_pre.scm.meta +++ b/physics/Interstitials/GFS/GFS_time_vary_pre.scm.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = GFS_time_vary_pre type = scheme - dependencies = funcphys.f90,machine.F + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/aerinterp.F90 b/physics/Interstitials/GFS/aerinterp.F90 similarity index 100% rename from physics/aerinterp.F90 rename to physics/Interstitials/GFS/aerinterp.F90 diff --git a/physics/cnvc90.f b/physics/Interstitials/GFS/cnvc90.f similarity index 100% rename from physics/cnvc90.f rename to physics/Interstitials/GFS/cnvc90.f diff --git a/physics/cnvc90.meta b/physics/Interstitials/GFS/cnvc90.meta similarity index 98% rename from physics/cnvc90.meta rename to physics/Interstitials/GFS/cnvc90.meta index 9728266d4..bbf161eb5 100644 --- a/physics/cnvc90.meta +++ b/physics/Interstitials/GFS/cnvc90.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = cnvc90 type = scheme - dependencies = + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/dcyc2t3.f b/physics/Interstitials/GFS/dcyc2t3.f similarity index 100% rename from physics/dcyc2t3.f rename to physics/Interstitials/GFS/dcyc2t3.f diff --git a/physics/dcyc2t3.meta b/physics/Interstitials/GFS/dcyc2t3.meta similarity index 99% rename from physics/dcyc2t3.meta rename to physics/Interstitials/GFS/dcyc2t3.meta index 65b05f4b3..95b3f341b 100644 --- a/physics/dcyc2t3.meta +++ b/physics/Interstitials/GFS/dcyc2t3.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = dcyc2t3 type = scheme - dependencies = machine.F,physcons.F90 + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/gcycle.F90 b/physics/Interstitials/GFS/gcycle.F90 similarity index 100% rename from physics/gcycle.F90 rename to physics/Interstitials/GFS/gcycle.F90 diff --git a/physics/iccn_def.F b/physics/Interstitials/GFS/iccn_def.F similarity index 100% rename from physics/iccn_def.F rename to physics/Interstitials/GFS/iccn_def.F diff --git a/physics/iccninterp.F90 b/physics/Interstitials/GFS/iccninterp.F90 similarity index 100% rename from physics/iccninterp.F90 rename to physics/Interstitials/GFS/iccninterp.F90 diff --git a/physics/maximum_hourly_diagnostics.F90 b/physics/Interstitials/GFS/maximum_hourly_diagnostics.F90 similarity index 100% rename from physics/maximum_hourly_diagnostics.F90 rename to physics/Interstitials/GFS/maximum_hourly_diagnostics.F90 diff --git a/physics/maximum_hourly_diagnostics.meta b/physics/Interstitials/GFS/maximum_hourly_diagnostics.meta similarity index 99% rename from physics/maximum_hourly_diagnostics.meta rename to physics/Interstitials/GFS/maximum_hourly_diagnostics.meta index e9d0876d2..0c2d1bcbe 100644 --- a/physics/maximum_hourly_diagnostics.meta +++ b/physics/Interstitials/GFS/maximum_hourly_diagnostics.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = maximum_hourly_diagnostics type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/phys_tend.F90 b/physics/Interstitials/GFS/phys_tend.F90 similarity index 100% rename from physics/phys_tend.F90 rename to physics/Interstitials/GFS/phys_tend.F90 diff --git a/physics/phys_tend.meta b/physics/Interstitials/GFS/phys_tend.meta similarity index 98% rename from physics/phys_tend.meta rename to physics/Interstitials/GFS/phys_tend.meta index 0f78af20b..d2a7bcf6b 100644 --- a/physics/phys_tend.meta +++ b/physics/Interstitials/GFS/phys_tend.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = phys_tend type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/scm_sfc_flux_spec.F90 b/physics/Interstitials/GFS/scm_sfc_flux_spec.F90 similarity index 100% rename from physics/scm_sfc_flux_spec.F90 rename to physics/Interstitials/GFS/scm_sfc_flux_spec.F90 diff --git a/physics/scm_sfc_flux_spec.meta b/physics/Interstitials/GFS/scm_sfc_flux_spec.meta similarity index 99% rename from physics/scm_sfc_flux_spec.meta rename to physics/Interstitials/GFS/scm_sfc_flux_spec.meta index 52722f1c4..85bf403ad 100644 --- a/physics/scm_sfc_flux_spec.meta +++ b/physics/Interstitials/GFS/scm_sfc_flux_spec.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = scm_sfc_flux_spec type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfcsub.F b/physics/Interstitials/GFS/sfcsub.F similarity index 100% rename from physics/sfcsub.F rename to physics/Interstitials/GFS/sfcsub.F diff --git a/physics/sgscloud_radpost.F90 b/physics/Interstitials/GFS/sgscloud_radpost.F90 similarity index 100% rename from physics/sgscloud_radpost.F90 rename to physics/Interstitials/GFS/sgscloud_radpost.F90 diff --git a/physics/sgscloud_radpost.meta b/physics/Interstitials/GFS/sgscloud_radpost.meta similarity index 98% rename from physics/sgscloud_radpost.meta rename to physics/Interstitials/GFS/sgscloud_radpost.meta index 6ad91d496..046531a0a 100644 --- a/physics/sgscloud_radpost.meta +++ b/physics/Interstitials/GFS/sgscloud_radpost.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sgscloud_radpost type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sgscloud_radpre.F90 b/physics/Interstitials/GFS/sgscloud_radpre.F90 similarity index 100% rename from physics/sgscloud_radpre.F90 rename to physics/Interstitials/GFS/sgscloud_radpre.F90 diff --git a/physics/sgscloud_radpre.meta b/physics/Interstitials/GFS/sgscloud_radpre.meta similarity index 98% rename from physics/sgscloud_radpre.meta rename to physics/Interstitials/GFS/sgscloud_radpre.meta index d5341bcd4..c9fd5950c 100644 --- a/physics/sgscloud_radpre.meta +++ b/physics/Interstitials/GFS/sgscloud_radpre.meta @@ -1,7 +1,10 @@ [ccpp-table-properties] name = sgscloud_radpre type = scheme - dependencies = funcphys.f90,iounitdef.f,machine.F,module_bfmicrophysics.f,physcons.F90,radcons.f90,radiation_clouds.f,module_mp_thompson.F90 + relative_path = ../../ + dependencies = tools/funcphys.f90,Radiation/iounitdef.f,hooks/machine.F,hooks/physcons.F90 + dependencies = hooks/physcons.F90,Radiation/RRTMG/radcons.f90 + dependencies = Radiation/radiation_clouds.f,MP/Thompson/module_mp_thompson.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/clm_lake.f90 b/physics/Land/CLM_lake/clm_lake.f90 similarity index 100% rename from physics/clm_lake.f90 rename to physics/Land/CLM_lake/clm_lake.f90 diff --git a/physics/clm_lake.meta b/physics/Land/CLM_lake/clm_lake.meta similarity index 99% rename from physics/clm_lake.meta rename to physics/Land/CLM_lake/clm_lake.meta index bbaaded16..49564f66c 100644 --- a/physics/clm_lake.meta +++ b/physics/Land/CLM_lake/clm_lake.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = clm_lake type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/flake.F90 b/physics/Land/Flake/flake.F90 similarity index 100% rename from physics/flake.F90 rename to physics/Land/Flake/flake.F90 diff --git a/physics/flake_driver.F90 b/physics/Land/Flake/flake_driver.F90 similarity index 100% rename from physics/flake_driver.F90 rename to physics/Land/Flake/flake_driver.F90 diff --git a/physics/flake_driver.meta b/physics/Land/Flake/flake_driver.meta similarity index 99% rename from physics/flake_driver.meta rename to physics/Land/Flake/flake_driver.meta index e665dc962..8b295bc27 100644 --- a/physics/flake_driver.meta +++ b/physics/Land/Flake/flake_driver.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = flake_driver type = scheme - dependencies = flake.F90,machine.F + dependencies = ../../hooks/machine.F,flake.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/lsm_noah.f b/physics/Land/Noah/lsm_noah.f similarity index 100% rename from physics/lsm_noah.f rename to physics/Land/Noah/lsm_noah.f diff --git a/physics/lsm_noah.meta b/physics/Land/Noah/lsm_noah.meta similarity index 99% rename from physics/lsm_noah.meta rename to physics/Land/Noah/lsm_noah.meta index e059a22c6..2dc612d5b 100644 --- a/physics/lsm_noah.meta +++ b/physics/Land/Noah/lsm_noah.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = lsm_noah type = scheme - dependencies = funcphys.f90,machine.F,set_soilveg.f,sflx.f,surface_perturbation.F90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F + dependencies = ../set_soilveg.f,sflx.f,surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/sflx.f b/physics/Land/Noah/sflx.f similarity index 100% rename from physics/sflx.f rename to physics/Land/Noah/sflx.f diff --git a/physics/surface_perturbation.F90 b/physics/Land/Noah/surface_perturbation.F90 similarity index 100% rename from physics/surface_perturbation.F90 rename to physics/Land/Noah/surface_perturbation.F90 diff --git a/physics/module_sf_noahmp_glacier.F90 b/physics/Land/Noahmp/module_sf_noahmp_glacier.F90 similarity index 100% rename from physics/module_sf_noahmp_glacier.F90 rename to physics/Land/Noahmp/module_sf_noahmp_glacier.F90 diff --git a/physics/module_sf_noahmplsm.F90 b/physics/Land/Noahmp/module_sf_noahmplsm.F90 similarity index 100% rename from physics/module_sf_noahmplsm.F90 rename to physics/Land/Noahmp/module_sf_noahmplsm.F90 diff --git a/physics/noahmp_tables.f90 b/physics/Land/Noahmp/noahmp_tables.f90 similarity index 100% rename from physics/noahmp_tables.f90 rename to physics/Land/Noahmp/noahmp_tables.f90 diff --git a/physics/noahmpdrv.F90 b/physics/Land/Noahmp/noahmpdrv.F90 similarity index 100% rename from physics/noahmpdrv.F90 rename to physics/Land/Noahmp/noahmpdrv.F90 diff --git a/physics/noahmpdrv.meta b/physics/Land/Noahmp/noahmpdrv.meta similarity index 99% rename from physics/noahmpdrv.meta rename to physics/Land/Noahmp/noahmpdrv.meta index 820da5740..55a787cd7 100644 --- a/physics/noahmpdrv.meta +++ b/physics/Land/Noahmp/noahmpdrv.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = noahmpdrv type = scheme - dependencies = funcphys.f90,machine.F,sfc_diff.f,module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90,set_soilveg.f + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90,../set_soilveg.f ######################################################################## [ccpp-arg-table] diff --git a/physics/noahmptable.tbl b/physics/Land/Noahmp/noahmptable.tbl similarity index 100% rename from physics/noahmptable.tbl rename to physics/Land/Noahmp/noahmptable.tbl diff --git a/physics/lsm_ruc.F90 b/physics/Land/RUC/lsm_ruc.F90 similarity index 100% rename from physics/lsm_ruc.F90 rename to physics/Land/RUC/lsm_ruc.F90 diff --git a/physics/lsm_ruc.meta b/physics/Land/RUC/lsm_ruc.meta similarity index 99% rename from physics/lsm_ruc.meta rename to physics/Land/RUC/lsm_ruc.meta index 34a5b8a8b..f02d6de67 100644 --- a/physics/lsm_ruc.meta +++ b/physics/Land/RUC/lsm_ruc.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = lsm_ruc type = scheme - dependencies = machine.F,module_sf_ruclsm.F90,module_soil_pre.F90,namelist_soilveg_ruc.F90,set_soilveg_ruc.F90 + dependencies = ../../hooks/machine.F,module_sf_ruclsm.F90,module_soil_pre.F90,namelist_soilveg_ruc.F90,set_soilveg_ruc.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/module_sf_ruclsm.F90 b/physics/Land/RUC/module_sf_ruclsm.F90 similarity index 100% rename from physics/module_sf_ruclsm.F90 rename to physics/Land/RUC/module_sf_ruclsm.F90 diff --git a/physics/module_soil_pre.F90 b/physics/Land/RUC/module_soil_pre.F90 similarity index 100% rename from physics/module_soil_pre.F90 rename to physics/Land/RUC/module_soil_pre.F90 diff --git a/physics/namelist_soilveg_ruc.F90 b/physics/Land/RUC/namelist_soilveg_ruc.F90 similarity index 100% rename from physics/namelist_soilveg_ruc.F90 rename to physics/Land/RUC/namelist_soilveg_ruc.F90 diff --git a/physics/set_soilveg_ruc.F90 b/physics/Land/RUC/set_soilveg_ruc.F90 similarity index 100% rename from physics/set_soilveg_ruc.F90 rename to physics/Land/RUC/set_soilveg_ruc.F90 diff --git a/physics/namelist_soilveg.f b/physics/Land/namelist_soilveg.f similarity index 100% rename from physics/namelist_soilveg.f rename to physics/Land/namelist_soilveg.f diff --git a/physics/set_soilveg.f b/physics/Land/set_soilveg.f similarity index 100% rename from physics/set_soilveg.f rename to physics/Land/set_soilveg.f diff --git a/physics/module_MP_FER_HIRES.F90 b/physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90 similarity index 100% rename from physics/module_MP_FER_HIRES.F90 rename to physics/MP/Ferrier_Aligo/module_MP_FER_HIRES.F90 diff --git a/physics/mp_fer_hires.F90 b/physics/MP/Ferrier_Aligo/mp_fer_hires.F90 similarity index 100% rename from physics/mp_fer_hires.F90 rename to physics/MP/Ferrier_Aligo/mp_fer_hires.F90 diff --git a/physics/mp_fer_hires.meta b/physics/MP/Ferrier_Aligo/mp_fer_hires.meta similarity index 99% rename from physics/mp_fer_hires.meta rename to physics/MP/Ferrier_Aligo/mp_fer_hires.meta index 9f7c63d4d..0f7be213e 100644 --- a/physics/mp_fer_hires.meta +++ b/physics/MP/Ferrier_Aligo/mp_fer_hires.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mp_fer_hires type = scheme - dependencies = machine.F,module_MP_FER_HIRES.F90 + dependencies = ../../hooks/machine.F,module_MP_FER_HIRES.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/GFDL_parse_tracers.F90 b/physics/MP/GFDL/GFDL_parse_tracers.F90 similarity index 100% rename from physics/GFDL_parse_tracers.F90 rename to physics/MP/GFDL/GFDL_parse_tracers.F90 diff --git a/physics/fv_sat_adj.F90 b/physics/MP/GFDL/fv_sat_adj.F90 similarity index 100% rename from physics/fv_sat_adj.F90 rename to physics/MP/GFDL/fv_sat_adj.F90 diff --git a/physics/fv_sat_adj.meta b/physics/MP/GFDL/fv_sat_adj.meta similarity index 99% rename from physics/fv_sat_adj.meta rename to physics/MP/GFDL/fv_sat_adj.meta index 5cdc96358..8c3c9be42 100644 --- a/physics/fv_sat_adj.meta +++ b/physics/MP/GFDL/fv_sat_adj.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = fv_sat_adj type = scheme - dependencies = machine.F,module_gfdl_cloud_microphys.F90,module_mp_radar.F90,multi_gases.F90,physcons.F90 + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90,module_gfdl_cloud_microphys.F90,multi_gases.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/gfdl_cloud_microphys.F90 b/physics/MP/GFDL/gfdl_cloud_microphys.F90 similarity index 100% rename from physics/gfdl_cloud_microphys.F90 rename to physics/MP/GFDL/gfdl_cloud_microphys.F90 diff --git a/physics/gfdl_cloud_microphys.meta b/physics/MP/GFDL/gfdl_cloud_microphys.meta similarity index 99% rename from physics/gfdl_cloud_microphys.meta rename to physics/MP/GFDL/gfdl_cloud_microphys.meta index 5e752b473..35b216d4a 100644 --- a/physics/gfdl_cloud_microphys.meta +++ b/physics/MP/GFDL/gfdl_cloud_microphys.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = gfdl_cloud_microphys type = scheme - dependencies = machine.F,module_mp_radar.F90,module_gfdl_cloud_microphys.F90 + dependencies = ../../hooks/machine.F,module_gfdl_cloud_microphys.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/gfdl_sfc_layer.F90 b/physics/MP/GFDL/gfdl_sfc_layer.F90 similarity index 100% rename from physics/gfdl_sfc_layer.F90 rename to physics/MP/GFDL/gfdl_sfc_layer.F90 diff --git a/physics/gfdl_sfc_layer.meta b/physics/MP/GFDL/gfdl_sfc_layer.meta similarity index 99% rename from physics/gfdl_sfc_layer.meta rename to physics/MP/GFDL/gfdl_sfc_layer.meta index f1c7a4ce2..a64fe277c 100644 --- a/physics/gfdl_sfc_layer.meta +++ b/physics/MP/GFDL/gfdl_sfc_layer.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = gfdl_sfc_layer type = scheme - dependencies = machine.F,module_sf_exchcoef.f90,namelist_soilveg_ruc.F90,noahmp_tables.f90 + dependencies = ../../hooks/machine.F,../SFC_Layer/module_sf_exchcoef.f90,../../Land/RUC/namelist_soilveg_ruc.F90,../../Land/Noahmp/noahmp_tables.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/module_gfdl_cloud_microphys.F90 b/physics/MP/GFDL/module_gfdl_cloud_microphys.F90 similarity index 100% rename from physics/module_gfdl_cloud_microphys.F90 rename to physics/MP/GFDL/module_gfdl_cloud_microphys.F90 diff --git a/physics/module_sf_exchcoef.f90 b/physics/MP/GFDL/module_sf_exchcoef.f90 similarity index 100% rename from physics/module_sf_exchcoef.f90 rename to physics/MP/GFDL/module_sf_exchcoef.f90 diff --git a/physics/multi_gases.F90 b/physics/MP/GFDL/multi_gases.F90 similarity index 100% rename from physics/multi_gases.F90 rename to physics/MP/GFDL/multi_gases.F90 diff --git a/physics/aer_cloud.F b/physics/MP/Morrison_Gettelman/aer_cloud.F similarity index 100% rename from physics/aer_cloud.F rename to physics/MP/Morrison_Gettelman/aer_cloud.F diff --git a/physics/aerclm_def.F b/physics/MP/Morrison_Gettelman/aerclm_def.F similarity index 100% rename from physics/aerclm_def.F rename to physics/MP/Morrison_Gettelman/aerclm_def.F diff --git a/physics/cldmacro.F b/physics/MP/Morrison_Gettelman/cldmacro.F similarity index 100% rename from physics/cldmacro.F rename to physics/MP/Morrison_Gettelman/cldmacro.F diff --git a/physics/cldwat2m_micro.F b/physics/MP/Morrison_Gettelman/cldwat2m_micro.F similarity index 100% rename from physics/cldwat2m_micro.F rename to physics/MP/Morrison_Gettelman/cldwat2m_micro.F diff --git a/physics/m_micro.F90 b/physics/MP/Morrison_Gettelman/m_micro.F90 similarity index 100% rename from physics/m_micro.F90 rename to physics/MP/Morrison_Gettelman/m_micro.F90 diff --git a/physics/m_micro.meta b/physics/MP/Morrison_Gettelman/m_micro.meta similarity index 99% rename from physics/m_micro.meta rename to physics/MP/Morrison_Gettelman/m_micro.meta index a9b5ec4db..4b6df18c7 100644 --- a/physics/m_micro.meta +++ b/physics/MP/Morrison_Gettelman/m_micro.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = m_micro type = scheme - dependencies = aer_cloud.F,aerclm_def.F,cldmacro.F,cldwat2m_micro.F,machine.F,micro_mg_utils.F90,micro_mg2_0.F90,micro_mg3_0.F90,physcons.F90,wv_saturation.F,machine.F + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90,aer_cloud.F,aerclm_def.F,cldmacro.F,cldwat2m_micro.F,micro_mg_utils.F90,micro_mg2_0.F90,micro_mg3_0.F90,wv_saturation.F ######################################################################## [ccpp-arg-table] diff --git a/physics/m_micro_post.F90 b/physics/MP/Morrison_Gettelman/m_micro_post.F90 similarity index 100% rename from physics/m_micro_post.F90 rename to physics/MP/Morrison_Gettelman/m_micro_post.F90 diff --git a/physics/m_micro_post.meta b/physics/MP/Morrison_Gettelman/m_micro_post.meta similarity index 99% rename from physics/m_micro_post.meta rename to physics/MP/Morrison_Gettelman/m_micro_post.meta index 684ac3f21..88a4325e7 100644 --- a/physics/m_micro_post.meta +++ b/physics/MP/Morrison_Gettelman/m_micro_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = m_micro_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/m_micro_pre.F90 b/physics/MP/Morrison_Gettelman/m_micro_pre.F90 similarity index 100% rename from physics/m_micro_pre.F90 rename to physics/MP/Morrison_Gettelman/m_micro_pre.F90 diff --git a/physics/m_micro_pre.meta b/physics/MP/Morrison_Gettelman/m_micro_pre.meta similarity index 99% rename from physics/m_micro_pre.meta rename to physics/MP/Morrison_Gettelman/m_micro_pre.meta index 7ac592833..b8cd2ac32 100644 --- a/physics/m_micro_pre.meta +++ b/physics/MP/Morrison_Gettelman/m_micro_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = m_micro_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/micro_mg2_0.F90 b/physics/MP/Morrison_Gettelman/micro_mg2_0.F90 similarity index 100% rename from physics/micro_mg2_0.F90 rename to physics/MP/Morrison_Gettelman/micro_mg2_0.F90 diff --git a/physics/micro_mg3_0.F90 b/physics/MP/Morrison_Gettelman/micro_mg3_0.F90 similarity index 100% rename from physics/micro_mg3_0.F90 rename to physics/MP/Morrison_Gettelman/micro_mg3_0.F90 diff --git a/physics/micro_mg_utils.F90 b/physics/MP/Morrison_Gettelman/micro_mg_utils.F90 similarity index 100% rename from physics/micro_mg_utils.F90 rename to physics/MP/Morrison_Gettelman/micro_mg_utils.F90 diff --git a/physics/wv_saturation.F b/physics/MP/Morrison_Gettelman/wv_saturation.F similarity index 100% rename from physics/wv_saturation.F rename to physics/MP/Morrison_Gettelman/wv_saturation.F diff --git a/physics/module_mp_nssl_2mom.F90 b/physics/MP/NSSL/module_mp_nssl_2mom.F90 similarity index 100% rename from physics/module_mp_nssl_2mom.F90 rename to physics/MP/NSSL/module_mp_nssl_2mom.F90 diff --git a/physics/mp_nssl.F90 b/physics/MP/NSSL/mp_nssl.F90 similarity index 100% rename from physics/mp_nssl.F90 rename to physics/MP/NSSL/mp_nssl.F90 diff --git a/physics/mp_nssl.meta b/physics/MP/NSSL/mp_nssl.meta similarity index 99% rename from physics/mp_nssl.meta rename to physics/MP/NSSL/mp_nssl.meta index 6bbf92c73..ff7c82223 100644 --- a/physics/mp_nssl.meta +++ b/physics/MP/NSSL/mp_nssl.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mp_nssl type = scheme - dependencies = machine.F,module_mp_nssl_2mom.F90 + dependencies = ../../hooks/machine.F,module_mp_nssl_2mom.F90 [ccpp-arg-table] name = mp_nssl_init diff --git a/physics/module_mp_radar.F90 b/physics/MP/Thompson/module_mp_radar.F90 similarity index 100% rename from physics/module_mp_radar.F90 rename to physics/MP/Thompson/module_mp_radar.F90 diff --git a/physics/module_mp_thompson.F90 b/physics/MP/Thompson/module_mp_thompson.F90 similarity index 100% rename from physics/module_mp_thompson.F90 rename to physics/MP/Thompson/module_mp_thompson.F90 diff --git a/physics/module_mp_thompson_make_number_concentrations.F90 b/physics/MP/Thompson/module_mp_thompson_make_number_concentrations.F90 similarity index 100% rename from physics/module_mp_thompson_make_number_concentrations.F90 rename to physics/MP/Thompson/module_mp_thompson_make_number_concentrations.F90 diff --git a/physics/mp_thompson.F90 b/physics/MP/Thompson/mp_thompson.F90 similarity index 100% rename from physics/mp_thompson.F90 rename to physics/MP/Thompson/mp_thompson.F90 diff --git a/physics/mp_thompson.meta b/physics/MP/Thompson/mp_thompson.meta similarity index 99% rename from physics/mp_thompson.meta rename to physics/MP/Thompson/mp_thompson.meta index 691698281..c3795e10e 100644 --- a/physics/mp_thompson.meta +++ b/physics/MP/Thompson/mp_thompson.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mp_thompson type = scheme - dependencies = machine.F,module_mp_radar.F90,module_mp_thompson.F90,module_mp_thompson_make_number_concentrations.F90 + dependencies = ../../hooks/machine.F,module_mp_radar.F90,module_mp_thompson.F90,module_mp_thompson_make_number_concentrations.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/mp_thompson_post.F90 b/physics/MP/Thompson/mp_thompson_post.F90 similarity index 100% rename from physics/mp_thompson_post.F90 rename to physics/MP/Thompson/mp_thompson_post.F90 diff --git a/physics/mp_thompson_post.meta b/physics/MP/Thompson/mp_thompson_post.meta similarity index 98% rename from physics/mp_thompson_post.meta rename to physics/MP/Thompson/mp_thompson_post.meta index 82b035e99..43e89b29c 100644 --- a/physics/mp_thompson_post.meta +++ b/physics/MP/Thompson/mp_thompson_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mp_thompson_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/mp_thompson_pre.F90 b/physics/MP/Thompson/mp_thompson_pre.F90 similarity index 100% rename from physics/mp_thompson_pre.F90 rename to physics/MP/Thompson/mp_thompson_pre.F90 diff --git a/physics/mp_thompson_pre.meta b/physics/MP/Thompson/mp_thompson_pre.meta similarity index 97% rename from physics/mp_thompson_pre.meta rename to physics/MP/Thompson/mp_thompson_pre.meta index 12e812bb3..563eb2809 100644 --- a/physics/mp_thompson_pre.meta +++ b/physics/MP/Thompson/mp_thompson_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mp_thompson_pre type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/zhaocarr_gscond.f b/physics/MP/Zhao_Carr/zhaocarr_gscond.f similarity index 100% rename from physics/zhaocarr_gscond.f rename to physics/MP/Zhao_Carr/zhaocarr_gscond.f diff --git a/physics/zhaocarr_gscond.meta b/physics/MP/Zhao_Carr/zhaocarr_gscond.meta similarity index 98% rename from physics/zhaocarr_gscond.meta rename to physics/MP/Zhao_Carr/zhaocarr_gscond.meta index 493397722..ed57ca909 100644 --- a/physics/zhaocarr_gscond.meta +++ b/physics/MP/Zhao_Carr/zhaocarr_gscond.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = zhaocarr_gscond type = scheme - dependencies = funcphys.f90,machine.F,physcons.F90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/zhaocarr_precpd.f b/physics/MP/Zhao_Carr/zhaocarr_precpd.f similarity index 100% rename from physics/zhaocarr_precpd.f rename to physics/MP/Zhao_Carr/zhaocarr_precpd.f diff --git a/physics/zhaocarr_precpd.meta b/physics/MP/Zhao_Carr/zhaocarr_precpd.meta similarity index 98% rename from physics/zhaocarr_precpd.meta rename to physics/MP/Zhao_Carr/zhaocarr_precpd.meta index 67f1a530b..86e6c7d67 100644 --- a/physics/zhaocarr_precpd.meta +++ b/physics/MP/Zhao_Carr/zhaocarr_precpd.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = zhaocarr_precpd type = scheme - dependencies = funcphys.f90,machine.F,physcons.F90 + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/calpreciptype.f90 b/physics/MP/calpreciptype.f90 similarity index 100% rename from physics/calpreciptype.f90 rename to physics/MP/calpreciptype.f90 diff --git a/physics/gfs_phy_tracer_config.F b/physics/NOTUSED/gfs_phy_tracer_config.F similarity index 100% rename from physics/gfs_phy_tracer_config.F rename to physics/NOTUSED/gfs_phy_tracer_config.F diff --git a/physics/gocart_tracer_config_stub.f b/physics/NOTUSED/gocart_tracer_config_stub.f similarity index 100% rename from physics/gocart_tracer_config_stub.f rename to physics/NOTUSED/gocart_tracer_config_stub.f diff --git a/physics/rrtmg_lw_pre.F90 b/physics/NOTUSED/rrtmg_lw_pre.F90 similarity index 100% rename from physics/rrtmg_lw_pre.F90 rename to physics/NOTUSED/rrtmg_lw_pre.F90 diff --git a/physics/rrtmg_lw_pre.meta b/physics/NOTUSED/rrtmg_lw_pre.meta similarity index 100% rename from physics/rrtmg_lw_pre.meta rename to physics/NOTUSED/rrtmg_lw_pre.meta diff --git a/physics/hedmf.f b/physics/PBL/HEDMF/hedmf.f similarity index 100% rename from physics/hedmf.f rename to physics/PBL/HEDMF/hedmf.f diff --git a/physics/hedmf.meta b/physics/PBL/HEDMF/hedmf.meta similarity index 99% rename from physics/hedmf.meta rename to physics/PBL/HEDMF/hedmf.meta index c2d873065..be0c83741 100644 --- a/physics/hedmf.meta +++ b/physics/PBL/HEDMF/hedmf.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = hedmf type = scheme - dependencies = funcphys.f90,machine.F,mfpbl.f,physcons.F90,tridi.f + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../../hooks/physcons.F90,../mfpbl.f,../tridi.f ######################################################################## [ccpp-arg-table] diff --git a/physics/module_BL_MYJPBL.F90 b/physics/PBL/MYJ/module_BL_MYJPBL.F90 similarity index 100% rename from physics/module_BL_MYJPBL.F90 rename to physics/PBL/MYJ/module_BL_MYJPBL.F90 diff --git a/physics/myjpbl_wrapper.F90 b/physics/PBL/MYJ/myjpbl_wrapper.F90 similarity index 100% rename from physics/myjpbl_wrapper.F90 rename to physics/PBL/MYJ/myjpbl_wrapper.F90 diff --git a/physics/myjpbl_wrapper.meta b/physics/PBL/MYJ/myjpbl_wrapper.meta similarity index 99% rename from physics/myjpbl_wrapper.meta rename to physics/PBL/MYJ/myjpbl_wrapper.meta index 427088b86..281396eed 100644 --- a/physics/myjpbl_wrapper.meta +++ b/physics/PBL/MYJ/myjpbl_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = myjpbl_wrapper type = scheme - dependencies = module_BL_MYJPBL.F90 + dependencies = ../../hooks/machine.F,module_BL_MYJPBL.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/bl_mynn_common.f90 b/physics/PBL/MYNN_EDMF/bl_mynn_common.f90 similarity index 100% rename from physics/bl_mynn_common.f90 rename to physics/PBL/MYNN_EDMF/bl_mynn_common.f90 diff --git a/physics/module_bl_mynn.F90 b/physics/PBL/MYNN_EDMF/module_bl_mynn.F90 similarity index 100% rename from physics/module_bl_mynn.F90 rename to physics/PBL/MYNN_EDMF/module_bl_mynn.F90 diff --git a/physics/mynnedmf_wrapper.F90 b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90 similarity index 100% rename from physics/mynnedmf_wrapper.F90 rename to physics/PBL/MYNN_EDMF/mynnedmf_wrapper.F90 diff --git a/physics/mynnedmf_wrapper.meta b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta similarity index 99% rename from physics/mynnedmf_wrapper.meta rename to physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta index ec4706aba..8e88d9620 100644 --- a/physics/mynnedmf_wrapper.meta +++ b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mynnedmf_wrapper type = scheme - dependencies = machine.F,module_bl_mynn.F90,physcons.F90,bl_mynn_common.f90 + dependencies = ../../hooks/machine.F,module_bl_mynn.F90,bl_mynn_common.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/mfscu.f b/physics/PBL/SATMEDMF/mfscu.f similarity index 100% rename from physics/mfscu.f rename to physics/PBL/SATMEDMF/mfscu.f diff --git a/physics/mfscuq.f b/physics/PBL/SATMEDMF/mfscuq.f similarity index 100% rename from physics/mfscuq.f rename to physics/PBL/SATMEDMF/mfscuq.f diff --git a/physics/satmedmfvdif.F b/physics/PBL/SATMEDMF/satmedmfvdif.F similarity index 100% rename from physics/satmedmfvdif.F rename to physics/PBL/SATMEDMF/satmedmfvdif.F diff --git a/physics/satmedmfvdif.meta b/physics/PBL/SATMEDMF/satmedmfvdif.meta similarity index 99% rename from physics/satmedmfvdif.meta rename to physics/PBL/SATMEDMF/satmedmfvdif.meta index 3609ed50f..b94e74d6c 100644 --- a/physics/satmedmfvdif.meta +++ b/physics/PBL/SATMEDMF/satmedmfvdif.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = satmedmfvdif type = scheme - dependencies = funcphys.f90,machine.F,mfpblt.f,mfscu.f,tridi.f + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../mfpblt.f,mfscu.f,../tridi.f ######################################################################## [ccpp-arg-table] diff --git a/physics/satmedmfvdifq.F b/physics/PBL/SATMEDMF/satmedmfvdifq.F similarity index 100% rename from physics/satmedmfvdifq.F rename to physics/PBL/SATMEDMF/satmedmfvdifq.F diff --git a/physics/satmedmfvdifq.meta b/physics/PBL/SATMEDMF/satmedmfvdifq.meta similarity index 99% rename from physics/satmedmfvdifq.meta rename to physics/PBL/SATMEDMF/satmedmfvdifq.meta index b6680dccb..ff718f138 100644 --- a/physics/satmedmfvdifq.meta +++ b/physics/PBL/SATMEDMF/satmedmfvdifq.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = satmedmfvdifq type = scheme - dependencies = funcphys.f90,machine.F,mfpbltq.f,mfscuq.f,tridi.f + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../mfpbltq.f,mfscuq.f,../tridi.f ######################################################################## [ccpp-arg-table] diff --git a/physics/moninshoc.f b/physics/PBL/SHOC/moninshoc.f similarity index 100% rename from physics/moninshoc.f rename to physics/PBL/SHOC/moninshoc.f diff --git a/physics/moninshoc.meta b/physics/PBL/SHOC/moninshoc.meta similarity index 99% rename from physics/moninshoc.meta rename to physics/PBL/SHOC/moninshoc.meta index dca5736f5..474689ea0 100644 --- a/physics/moninshoc.meta +++ b/physics/PBL/SHOC/moninshoc.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = moninshoc type = scheme - dependencies = funcphys.f90,machine.F,mfpbl.f,tridi.f + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,../mfpbl.f,../tridi.f ######################################################################## [ccpp-arg-table] diff --git a/physics/shoc.F90 b/physics/PBL/SHOC/shoc.F90 similarity index 100% rename from physics/shoc.F90 rename to physics/PBL/SHOC/shoc.F90 diff --git a/physics/shoc.meta b/physics/PBL/SHOC/shoc.meta similarity index 99% rename from physics/shoc.meta rename to physics/PBL/SHOC/shoc.meta index 984c6aec5..a1550ce11 100644 --- a/physics/shoc.meta +++ b/physics/PBL/SHOC/shoc.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = shoc type = scheme - dependencies = funcphys.f90,machine.F + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/ysuvdif.F90 b/physics/PBL/YSU/ysuvdif.F90 similarity index 100% rename from physics/ysuvdif.F90 rename to physics/PBL/YSU/ysuvdif.F90 diff --git a/physics/ysuvdif.meta b/physics/PBL/YSU/ysuvdif.meta similarity index 99% rename from physics/ysuvdif.meta rename to physics/PBL/YSU/ysuvdif.meta index 0007197bd..20e96a92d 100644 --- a/physics/ysuvdif.meta +++ b/physics/PBL/YSU/ysuvdif.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ysuvdif type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/mfpbl.f b/physics/PBL/mfpbl.f similarity index 100% rename from physics/mfpbl.f rename to physics/PBL/mfpbl.f diff --git a/physics/mfpblt.f b/physics/PBL/mfpblt.f similarity index 100% rename from physics/mfpblt.f rename to physics/PBL/mfpblt.f diff --git a/physics/mfpbltq.f b/physics/PBL/mfpbltq.f similarity index 100% rename from physics/mfpbltq.f rename to physics/PBL/mfpbltq.f diff --git a/physics/shinhongvdif.F90 b/physics/PBL/saYSU/shinhongvdif.F90 similarity index 100% rename from physics/shinhongvdif.F90 rename to physics/PBL/saYSU/shinhongvdif.F90 diff --git a/physics/shinhongvdif.meta b/physics/PBL/saYSU/shinhongvdif.meta similarity index 99% rename from physics/shinhongvdif.meta rename to physics/PBL/saYSU/shinhongvdif.meta index dcd3b96cd..8b1d48605 100644 --- a/physics/shinhongvdif.meta +++ b/physics/PBL/saYSU/shinhongvdif.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = shinhongvdif type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/tridi.f b/physics/PBL/tridi.f similarity index 100% rename from physics/tridi.f rename to physics/PBL/tridi.f diff --git a/physics/iounitdef.f b/physics/Radiation/RRTMG/iounitdef.f similarity index 100% rename from physics/iounitdef.f rename to physics/Radiation/RRTMG/iounitdef.f diff --git a/physics/module_bfmicrophysics.f b/physics/Radiation/RRTMG/module_bfmicrophysics.f similarity index 100% rename from physics/module_bfmicrophysics.f rename to physics/Radiation/RRTMG/module_bfmicrophysics.f diff --git a/physics/rad_sw_pre.F90 b/physics/Radiation/RRTMG/rad_sw_pre.F90 similarity index 100% rename from physics/rad_sw_pre.F90 rename to physics/Radiation/RRTMG/rad_sw_pre.F90 diff --git a/physics/rad_sw_pre.meta b/physics/Radiation/RRTMG/rad_sw_pre.meta similarity index 96% rename from physics/rad_sw_pre.meta rename to physics/Radiation/RRTMG/rad_sw_pre.meta index ccbdbf74b..9d14c6ffc 100644 --- a/physics/rad_sw_pre.meta +++ b/physics/Radiation/RRTMG/rad_sw_pre.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rad_sw_pre type = scheme - dependencies = iounitdef.f,machine.F + dependencies = iounitdef.f,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/radcons.f90 b/physics/Radiation/RRTMG/radcons.f90 similarity index 100% rename from physics/radcons.f90 rename to physics/Radiation/RRTMG/radcons.f90 diff --git a/physics/radlw_datatb.f b/physics/Radiation/RRTMG/radlw_datatb.f similarity index 100% rename from physics/radlw_datatb.f rename to physics/Radiation/RRTMG/radlw_datatb.f diff --git a/physics/radlw_main.F90 b/physics/Radiation/RRTMG/radlw_main.F90 similarity index 100% rename from physics/radlw_main.F90 rename to physics/Radiation/RRTMG/radlw_main.F90 diff --git a/physics/radlw_main.meta b/physics/Radiation/RRTMG/radlw_main.meta similarity index 99% rename from physics/radlw_main.meta rename to physics/Radiation/RRTMG/radlw_main.meta index 3dccc97b3..f7c80fb20 100644 --- a/physics/radlw_main.meta +++ b/physics/Radiation/RRTMG/radlw_main.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmg_lw type = scheme - dependencies = machine.F,mersenne_twister.f,physcons.F90,radlw_datatb.f,radlw_param.f + dependencies = ../../hooks/machine.F,../mersenne_twister.f,../../hooks/physcons.F90,radlw_datatb.f,radlw_param.f ######################################################################## [ccpp-arg-table] diff --git a/physics/radlw_param.f b/physics/Radiation/RRTMG/radlw_param.f similarity index 100% rename from physics/radlw_param.f rename to physics/Radiation/RRTMG/radlw_param.f diff --git a/physics/radlw_param.meta b/physics/Radiation/RRTMG/radlw_param.meta similarity index 100% rename from physics/radlw_param.meta rename to physics/Radiation/RRTMG/radlw_param.meta diff --git a/physics/radsw_datatb.f b/physics/Radiation/RRTMG/radsw_datatb.f similarity index 100% rename from physics/radsw_datatb.f rename to physics/Radiation/RRTMG/radsw_datatb.f diff --git a/physics/radsw_main.F90 b/physics/Radiation/RRTMG/radsw_main.F90 similarity index 100% rename from physics/radsw_main.F90 rename to physics/Radiation/RRTMG/radsw_main.F90 diff --git a/physics/radsw_main.meta b/physics/Radiation/RRTMG/radsw_main.meta similarity index 99% rename from physics/radsw_main.meta rename to physics/Radiation/RRTMG/radsw_main.meta index 1edb6fcac..2169a26f0 100644 --- a/physics/radsw_main.meta +++ b/physics/Radiation/RRTMG/radsw_main.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmg_sw type = scheme - dependencies = machine.F,mersenne_twister.f,physcons.F90,radsw_datatb.f,radsw_param.f + dependencies = ../../hooks/machine.F,../mersenne_twister.f,../../hooks/physcons.F90,radsw_datatb.f,radsw_param.f ######################################################################## [ccpp-arg-table] diff --git a/physics/radsw_param.f b/physics/Radiation/RRTMG/radsw_param.f similarity index 100% rename from physics/radsw_param.f rename to physics/Radiation/RRTMG/radsw_param.f diff --git a/physics/radsw_param.meta b/physics/Radiation/RRTMG/radsw_param.meta similarity index 100% rename from physics/radsw_param.meta rename to physics/Radiation/RRTMG/radsw_param.meta diff --git a/physics/rrtmg_lw_cloud_optics.F90 b/physics/Radiation/RRTMG/rrtmg_lw_cloud_optics.F90 similarity index 100% rename from physics/rrtmg_lw_cloud_optics.F90 rename to physics/Radiation/RRTMG/rrtmg_lw_cloud_optics.F90 diff --git a/physics/rrtmg_lw_post.F90 b/physics/Radiation/RRTMG/rrtmg_lw_post.F90 similarity index 100% rename from physics/rrtmg_lw_post.F90 rename to physics/Radiation/RRTMG/rrtmg_lw_post.F90 diff --git a/physics/rrtmg_lw_post.meta b/physics/Radiation/RRTMG/rrtmg_lw_post.meta similarity index 99% rename from physics/rrtmg_lw_post.meta rename to physics/Radiation/RRTMG/rrtmg_lw_post.meta index 7f219c24f..6ed7c2365 100644 --- a/physics/rrtmg_lw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_lw_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmg_lw_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/rrtmg_sw_cloud_optics.F90 b/physics/Radiation/RRTMG/rrtmg_sw_cloud_optics.F90 similarity index 100% rename from physics/rrtmg_sw_cloud_optics.F90 rename to physics/Radiation/RRTMG/rrtmg_sw_cloud_optics.F90 diff --git a/physics/rrtmg_sw_post.F90 b/physics/Radiation/RRTMG/rrtmg_sw_post.F90 similarity index 100% rename from physics/rrtmg_sw_post.F90 rename to physics/Radiation/RRTMG/rrtmg_sw_post.F90 diff --git a/physics/rrtmg_sw_post.meta b/physics/Radiation/RRTMG/rrtmg_sw_post.meta similarity index 99% rename from physics/rrtmg_sw_post.meta rename to physics/Radiation/RRTMG/rrtmg_sw_post.meta index 6a9f4efb5..9914051ce 100644 --- a/physics/rrtmg_sw_post.meta +++ b/physics/Radiation/RRTMG/rrtmg_sw_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmg_sw_post type = scheme - dependencies = machine.F,radsw_param.f + dependencies = ../../hooks/machine.F,radsw_param.f ######################################################################## [ccpp-arg-table] diff --git a/physics/rrtmgp_aerosol_optics.F90 b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.F90 similarity index 100% rename from physics/rrtmgp_aerosol_optics.F90 rename to physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.F90 diff --git a/physics/rrtmgp_aerosol_optics.meta b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta similarity index 98% rename from physics/rrtmgp_aerosol_optics.meta rename to physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta index cc9eb1cc2..0847877d6 100644 --- a/physics/rrtmgp_aerosol_optics.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmgp_aerosol_optics type = scheme - dependencies = iounitdef.f,machine.F,radiation_aerosols.f,radiation_tools.F90 + dependencies = ../iounitdef.f,../../hooks/machine.F,../radiation_aerosols.f,../radiation_tools.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/rrtmgp_lw_cloud_optics.F90 b/physics/Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90 similarity index 100% rename from physics/rrtmgp_lw_cloud_optics.F90 rename to physics/Radiation/RRTMGP/rrtmgp_lw_cloud_optics.F90 diff --git a/physics/rrtmgp_lw_gas_optics.F90 b/physics/Radiation/RRTMGP/rrtmgp_lw_gas_optics.F90 similarity index 100% rename from physics/rrtmgp_lw_gas_optics.F90 rename to physics/Radiation/RRTMGP/rrtmgp_lw_gas_optics.F90 diff --git a/physics/rrtmgp_lw_main.F90 b/physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 similarity index 100% rename from physics/rrtmgp_lw_main.F90 rename to physics/Radiation/RRTMGP/rrtmgp_lw_main.F90 diff --git a/physics/rrtmgp_lw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta similarity index 98% rename from physics/rrtmgp_lw_main.meta rename to physics/Radiation/RRTMGP/rrtmgp_lw_main.meta index fd96eb14b..011376985 100644 --- a/physics/rrtmgp_lw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta @@ -1,12 +1,13 @@ [ccpp-table-properties] name = rrtmgp_lw_main type = scheme - dependencies = machine.F,radiation_tools.F90,GFS_rrtmgp_pre.F90,rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90 + dependencies = ../../hooks/machine.F,../radiation_tools.F90,../mersenne_twister.f + dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90 dependencies = rte-rrtmgp/rte/mo_rte_kind.F90,rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_optical_props.F90 dependencies = rte-rrtmgp/rte/mo_source_functions.F90,rte-rrtmgp/rte/mo_rte_lw.F90,rte-rrtmgp/rte/mo_fluxes.F90 dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 - dependencies = mersenne_twister.f,rrtmgp_sampling.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90 - dependencies = rrtmgp_lw_gas_optics.F90, rrtmgp_lw_cloud_optics.F90 + dependencies = rrtmgp_lw_gas_optics.F90, rrtmgp_lw_cloud_optics.F90,rrtmgp_sampling.F90 + dependencies = ../../GFS/GFS_rrtmgp_pre.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/rrtmgp_sampling.F90 b/physics/Radiation/RRTMGP/rrtmgp_sampling.F90 similarity index 100% rename from physics/rrtmgp_sampling.F90 rename to physics/Radiation/RRTMGP/rrtmgp_sampling.F90 diff --git a/physics/rrtmgp_sw_cloud_optics.F90 b/physics/Radiation/RRTMGP/rrtmgp_sw_cloud_optics.F90 similarity index 100% rename from physics/rrtmgp_sw_cloud_optics.F90 rename to physics/Radiation/RRTMGP/rrtmgp_sw_cloud_optics.F90 diff --git a/physics/rrtmgp_sw_gas_optics.F90 b/physics/Radiation/RRTMGP/rrtmgp_sw_gas_optics.F90 similarity index 100% rename from physics/rrtmgp_sw_gas_optics.F90 rename to physics/Radiation/RRTMGP/rrtmgp_sw_gas_optics.F90 diff --git a/physics/rrtmgp_sw_main.F90 b/physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 similarity index 100% rename from physics/rrtmgp_sw_main.F90 rename to physics/Radiation/RRTMGP/rrtmgp_sw_main.F90 diff --git a/physics/rrtmgp_sw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta similarity index 98% rename from physics/rrtmgp_sw_main.meta rename to physics/Radiation/RRTMGP/rrtmgp_sw_main.meta index dbb93a5df..932e2195e 100644 --- a/physics/rrtmgp_sw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta @@ -1,12 +1,13 @@ [ccpp-table-properties] name = rrtmgp_sw_main type = scheme - dependencies = machine.F,radiation_tools.F90,GFS_rrtmgp_pre.F90,rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90 + dependencies = ../../hooks/machine.F,../radiation_tools.F90,../mersenne_twister.f + dependencies = rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90 dependencies = rte-rrtmgp/rte/mo_rte_kind.F90,rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90,rte-rrtmgp/rte/mo_optical_props.F90 dependencies = rte-rrtmgp/rte/mo_rte_sw.F90,rte-rrtmgp/rte/mo_fluxes.F90 dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 - dependencies = mersenne_twister.f,rrtmgp_sampling.F90,rte-rrtmgp/extensions/mo_fluxes_byband.F90 - dependencies = rrtmgp_sw_gas_optics.F90, rrtmgp_sw_cloud_optics.F90 + dependencies = rrtmgp_sw_gas_optics.F90, rrtmgp_sw_cloud_optics.F90,rrtmgp_sampling.F90 + dependencies = ../../GFS/GFS_rrtmgp_pre.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/mersenne_twister.f b/physics/Radiation/mersenne_twister.f similarity index 100% rename from physics/mersenne_twister.f rename to physics/Radiation/mersenne_twister.f diff --git a/physics/radiation_aerosols.f b/physics/Radiation/radiation_aerosols.f similarity index 100% rename from physics/radiation_aerosols.f rename to physics/Radiation/radiation_aerosols.f diff --git a/physics/radiation_astronomy.f b/physics/Radiation/radiation_astronomy.f similarity index 100% rename from physics/radiation_astronomy.f rename to physics/Radiation/radiation_astronomy.f diff --git a/physics/radiation_cloud_overlap.F90 b/physics/Radiation/radiation_cloud_overlap.F90 similarity index 100% rename from physics/radiation_cloud_overlap.F90 rename to physics/Radiation/radiation_cloud_overlap.F90 diff --git a/physics/radiation_clouds.f b/physics/Radiation/radiation_clouds.f similarity index 100% rename from physics/radiation_clouds.f rename to physics/Radiation/radiation_clouds.f diff --git a/physics/radiation_gases.f b/physics/Radiation/radiation_gases.f similarity index 100% rename from physics/radiation_gases.f rename to physics/Radiation/radiation_gases.f diff --git a/physics/radiation_surface.f b/physics/Radiation/radiation_surface.f similarity index 100% rename from physics/radiation_surface.f rename to physics/Radiation/radiation_surface.f diff --git a/physics/radiation_tools.F90 b/physics/Radiation/radiation_tools.F90 similarity index 100% rename from physics/radiation_tools.F90 rename to physics/Radiation/radiation_tools.F90 diff --git a/physics/date_def.f b/physics/SFC_Layer/GFS_sfc/date_def.f similarity index 100% rename from physics/date_def.f rename to physics/SFC_Layer/GFS_sfc/date_def.f diff --git a/physics/module_nst_model.f90 b/physics/SFC_Layer/GFS_sfc/module_nst_model.f90 similarity index 100% rename from physics/module_nst_model.f90 rename to physics/SFC_Layer/GFS_sfc/module_nst_model.f90 diff --git a/physics/module_nst_parameters.f90 b/physics/SFC_Layer/GFS_sfc/module_nst_parameters.f90 similarity index 100% rename from physics/module_nst_parameters.f90 rename to physics/SFC_Layer/GFS_sfc/module_nst_parameters.f90 diff --git a/physics/module_nst_water_prop.f90 b/physics/SFC_Layer/GFS_sfc/module_nst_water_prop.f90 similarity index 100% rename from physics/module_nst_water_prop.f90 rename to physics/SFC_Layer/GFS_sfc/module_nst_water_prop.f90 diff --git a/physics/sfc_cice.f b/physics/SFC_Layer/GFS_sfc/sfc_cice.f similarity index 100% rename from physics/sfc_cice.f rename to physics/SFC_Layer/GFS_sfc/sfc_cice.f diff --git a/physics/sfc_cice.meta b/physics/SFC_Layer/GFS_sfc/sfc_cice.meta similarity index 99% rename from physics/sfc_cice.meta rename to physics/SFC_Layer/GFS_sfc/sfc_cice.meta index 796fb2f5d..52fa28a3d 100644 --- a/physics/sfc_cice.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_cice.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = sfc_cice type = scheme - dependencies = machine.F + relative_path = ../../ + dependencies = hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_diag.f b/physics/SFC_Layer/GFS_sfc/sfc_diag.f similarity index 100% rename from physics/sfc_diag.f rename to physics/SFC_Layer/GFS_sfc/sfc_diag.f diff --git a/physics/sfc_diag.meta b/physics/SFC_Layer/GFS_sfc/sfc_diag.meta similarity index 99% rename from physics/sfc_diag.meta rename to physics/SFC_Layer/GFS_sfc/sfc_diag.meta index a16290b58..6a82c2c61 100644 --- a/physics/sfc_diag.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_diag.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = sfc_diag type = scheme - dependencies = funcphys.f90,machine.F + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_diag_post.F90 b/physics/SFC_Layer/GFS_sfc/sfc_diag_post.F90 similarity index 100% rename from physics/sfc_diag_post.F90 rename to physics/SFC_Layer/GFS_sfc/sfc_diag_post.F90 diff --git a/physics/sfc_diag_post.meta b/physics/SFC_Layer/GFS_sfc/sfc_diag_post.meta similarity index 98% rename from physics/sfc_diag_post.meta rename to physics/SFC_Layer/GFS_sfc/sfc_diag_post.meta index c50d3c4dc..8c74e2154 100644 --- a/physics/sfc_diag_post.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_diag_post.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = sfc_diag_post type = scheme - dependencies = machine.F + relative_path = ../../ + dependencies = hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_diff.f b/physics/SFC_Layer/GFS_sfc/sfc_diff.f similarity index 100% rename from physics/sfc_diff.f rename to physics/SFC_Layer/GFS_sfc/sfc_diff.f diff --git a/physics/sfc_diff.meta b/physics/SFC_Layer/GFS_sfc/sfc_diff.meta similarity index 99% rename from physics/sfc_diff.meta rename to physics/SFC_Layer/GFS_sfc/sfc_diff.meta index eb30b8c50..b9f0c4f84 100644 --- a/physics/sfc_diff.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_diff.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = sfc_diff type = scheme - dependencies = machine.F + relative_path = ../../ + dependencies = hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_nst.f b/physics/SFC_Layer/GFS_sfc/sfc_nst.f similarity index 100% rename from physics/sfc_nst.f rename to physics/SFC_Layer/GFS_sfc/sfc_nst.f diff --git a/physics/sfc_nst.meta b/physics/SFC_Layer/GFS_sfc/sfc_nst.meta similarity index 99% rename from physics/sfc_nst.meta rename to physics/SFC_Layer/GFS_sfc/sfc_nst.meta index dc35ec959..131daaab0 100644 --- a/physics/sfc_nst.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_nst.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sfc_nst type = scheme - dependencies = date_def.f,funcphys.f90,machine.F,module_nst_model.f90,module_nst_parameters.f90,module_nst_water_prop.f90 + dependencies = date_def.f,../../tools/funcphys.f90,../../hooks/machine.F,module_nst_model.f90,module_nst_parameters.f90,module_nst_water_prop.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_nst_post.f b/physics/SFC_Layer/GFS_sfc/sfc_nst_post.f similarity index 100% rename from physics/sfc_nst_post.f rename to physics/SFC_Layer/GFS_sfc/sfc_nst_post.f diff --git a/physics/sfc_nst_post.meta b/physics/SFC_Layer/GFS_sfc/sfc_nst_post.meta similarity index 98% rename from physics/sfc_nst_post.meta rename to physics/SFC_Layer/GFS_sfc/sfc_nst_post.meta index 7f66118e9..caa487384 100644 --- a/physics/sfc_nst_post.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_nst_post.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = sfc_nst_post type = scheme - dependencies = machine.F,module_nst_parameters.f90,module_nst_water_prop.f90 + dependencies = ../../hooks/machine.F,module_nst_parameters.f90,module_nst_water_prop.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_nst_pre.f b/physics/SFC_Layer/GFS_sfc/sfc_nst_pre.f similarity index 100% rename from physics/sfc_nst_pre.f rename to physics/SFC_Layer/GFS_sfc/sfc_nst_pre.f diff --git a/physics/sfc_nst_pre.meta b/physics/SFC_Layer/GFS_sfc/sfc_nst_pre.meta similarity index 97% rename from physics/sfc_nst_pre.meta rename to physics/SFC_Layer/GFS_sfc/sfc_nst_pre.meta index 88788ff5c..e9cdef0d1 100644 --- a/physics/sfc_nst_pre.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_nst_pre.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = sfc_nst_pre type = scheme - dependencies = machine.F,module_nst_parameters.f90,module_nst_water_prop.f90 + dependencies = ../../hooks/machine.F,module_nst_parameters.f90,module_nst_water_prop.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_ocean.F b/physics/SFC_Layer/GFS_sfc/sfc_ocean.F similarity index 100% rename from physics/sfc_ocean.F rename to physics/SFC_Layer/GFS_sfc/sfc_ocean.F diff --git a/physics/sfc_ocean.meta b/physics/SFC_Layer/GFS_sfc/sfc_ocean.meta similarity index 99% rename from physics/sfc_ocean.meta rename to physics/SFC_Layer/GFS_sfc/sfc_ocean.meta index 15812e723..ea575a071 100644 --- a/physics/sfc_ocean.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_ocean.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sfc_ocean type = scheme - dependencies = funcphys.f90,machine.F + dependencies = ../../tools/funcphys.f90,../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/sfc_sice.f b/physics/SFC_Layer/GFS_sfc/sfc_sice.f similarity index 100% rename from physics/sfc_sice.f rename to physics/SFC_Layer/GFS_sfc/sfc_sice.f diff --git a/physics/sfc_sice.meta b/physics/SFC_Layer/GFS_sfc/sfc_sice.meta similarity index 99% rename from physics/sfc_sice.meta rename to physics/SFC_Layer/GFS_sfc/sfc_sice.meta index 75aab21a4..7277c0511 100644 --- a/physics/sfc_sice.meta +++ b/physics/SFC_Layer/GFS_sfc/sfc_sice.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = sfc_sice type = scheme - dependencies = funcphys.f90,machine.F + relative_path = ../../ + dependencies = tools/funcphys.f90,hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/module_SF_JSFC.F90 b/physics/SFC_Layer/MYJ/module_SF_JSFC.F90 similarity index 100% rename from physics/module_SF_JSFC.F90 rename to physics/SFC_Layer/MYJ/module_SF_JSFC.F90 diff --git a/physics/myjsfc_wrapper.F90 b/physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 similarity index 100% rename from physics/myjsfc_wrapper.F90 rename to physics/SFC_Layer/MYJ/myjsfc_wrapper.F90 diff --git a/physics/myjsfc_wrapper.meta b/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta similarity index 99% rename from physics/myjsfc_wrapper.meta rename to physics/SFC_Layer/MYJ/myjsfc_wrapper.meta index 40b6b78f3..9805db619 100644 --- a/physics/myjsfc_wrapper.meta +++ b/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = myjsfc_wrapper type = scheme - dependencies = module_SF_JSFC.F90 + dependencies = ../../hooks/machine.f,module_SF_JSFC.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/module_sf_mynn.F90 b/physics/SFC_Layer/MYNN/module_sf_mynn.F90 similarity index 100% rename from physics/module_sf_mynn.F90 rename to physics/SFC_Layer/MYNN/module_sf_mynn.F90 diff --git a/physics/mynnsfc_wrapper.F90 b/physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90 similarity index 100% rename from physics/mynnsfc_wrapper.F90 rename to physics/SFC_Layer/MYNN/mynnsfc_wrapper.F90 diff --git a/physics/mynnsfc_wrapper.meta b/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta similarity index 99% rename from physics/mynnsfc_wrapper.meta rename to physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta index d89cc5d35..a76df3790 100644 --- a/physics/mynnsfc_wrapper.meta +++ b/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mynnsfc_wrapper type = scheme - dependencies = machine.F,module_sf_mynn.F90 + dependencies = ../../hooks/machine.F,module_sf_mynn.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/h2o_def.f b/physics/h2o_photo/h2o_def.f similarity index 100% rename from physics/h2o_def.f rename to physics/h2o_photo/h2o_def.f diff --git a/physics/h2o_def.meta b/physics/h2o_photo/h2o_def.meta similarity index 94% rename from physics/h2o_def.meta rename to physics/h2o_photo/h2o_def.meta index 17f0f8779..3bb9bf94d 100644 --- a/physics/h2o_def.meta +++ b/physics/h2o_photo/h2o_def.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = h2o_def type = module - dependencies = machine.F + dependencies = ../../hooks/machine.F [ccpp-arg-table] name = h2o_def diff --git a/physics/h2ointerp.f90 b/physics/h2o_photo/h2ointerp.f90 similarity index 100% rename from physics/h2ointerp.f90 rename to physics/h2o_photo/h2ointerp.f90 diff --git a/physics/h2ophys.f b/physics/h2o_photo/h2ophys.f similarity index 100% rename from physics/h2ophys.f rename to physics/h2o_photo/h2ophys.f diff --git a/physics/h2ophys.meta b/physics/h2o_photo/h2ophys.meta similarity index 98% rename from physics/h2ophys.meta rename to physics/h2o_photo/h2ophys.meta index afe50bda1..d8a9eabab 100644 --- a/physics/h2ophys.meta +++ b/physics/h2o_photo/h2ophys.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = h2ophys type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/machine.F b/physics/hooks/machine.F similarity index 100% rename from physics/machine.F rename to physics/hooks/machine.F diff --git a/physics/machine.meta b/physics/hooks/machine.meta similarity index 100% rename from physics/machine.meta rename to physics/hooks/machine.meta diff --git a/physics/physcons.F90 b/physics/hooks/physcons.F90 similarity index 100% rename from physics/physcons.F90 rename to physics/hooks/physcons.F90 diff --git a/physics/ozinterp.f90 b/physics/o3_photo/ozinterp.f90 similarity index 100% rename from physics/ozinterp.f90 rename to physics/o3_photo/ozinterp.f90 diff --git a/physics/ozne_def.f b/physics/o3_photo/ozne_def.f similarity index 100% rename from physics/ozne_def.f rename to physics/o3_photo/ozne_def.f diff --git a/physics/ozne_def.meta b/physics/o3_photo/ozne_def.meta similarity index 95% rename from physics/ozne_def.meta rename to physics/o3_photo/ozne_def.meta index 3cad9c14d..3123892bb 100644 --- a/physics/ozne_def.meta +++ b/physics/o3_photo/ozne_def.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozne_def type = module - dependencies = machine.F + dependencies = ../../hooks/machine.F [ccpp-arg-table] name = ozne_def diff --git a/physics/ozphys.f b/physics/o3_photo/ozphys.f similarity index 100% rename from physics/ozphys.f rename to physics/o3_photo/ozphys.f diff --git a/physics/ozphys.meta b/physics/o3_photo/ozphys.meta similarity index 99% rename from physics/ozphys.meta rename to physics/o3_photo/ozphys.meta index 485e2a491..631dcb332 100644 --- a/physics/ozphys.meta +++ b/physics/o3_photo/ozphys.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozphys type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/ozphys_2015.f b/physics/o3_photo/ozphys_2015.f similarity index 100% rename from physics/ozphys_2015.f rename to physics/o3_photo/ozphys_2015.f diff --git a/physics/ozphys_2015.meta b/physics/o3_photo/ozphys_2015.meta similarity index 99% rename from physics/ozphys_2015.meta rename to physics/o3_photo/ozphys_2015.meta index 8bce7defe..7da8cdf27 100644 --- a/physics/ozphys_2015.meta +++ b/physics/o3_photo/ozphys_2015.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozphys_2015 type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/rte-rrtmgp b/physics/rte-rrtmgp deleted file mode 160000 index 0dc54f5ec..000000000 --- a/physics/rte-rrtmgp +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 0dc54f5ecaeb1e1e342efd1e02d0bcd41737bde2 diff --git a/physics/smoke_dust/rrfs_smoke_postpbl.meta b/physics/smoke_dust/rrfs_smoke_postpbl.meta index 50f7afae7..339f6ca03 100755 --- a/physics/smoke_dust/rrfs_smoke_postpbl.meta +++ b/physics/smoke_dust/rrfs_smoke_postpbl.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrfs_smoke_postpbl type = scheme - dependencies = dep_dry_mod.F90,module_wetdep_ls.F90,dust_data_mod.F90,dust_fengsha_mod.F90,module_add_emiss_burn.F90,module_plumerise1.F90,module_smoke_plumerise.F90,module_zero_plumegen_coms.F90,plume_data_mod.F90,rrfs_smoke_config.F90,seas_data_mod.F90,seas_mod.F90,seas_ngac_mod.F90 + dependencies = machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta index bf2fddd60..5bf86c6bd 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.meta +++ b/physics/smoke_dust/rrfs_smoke_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrfs_smoke_wrapper type = scheme - dependencies = dep_dry_mod.F90,module_wetdep_ls.F90,dust_data_mod.F90,dust_fengsha_mod.F90,module_add_emiss_burn.F90,module_plumerise1.F90,module_smoke_plumerise.F90,module_zero_plumegen_coms.F90,plume_data_mod.F90,rrfs_smoke_config.F90,seas_data_mod.F90,seas_mod.F90,seas_ngac_mod.F90,coarsepm_settling_mod.F90 + dependencies = machine.F,dep_dry_mod.F90,module_wetdep_ls.F90,dust_data_mod.F90,dust_fengsha_mod.F90,module_add_emiss_burn.F90,module_plumerise1.F90,module_smoke_plumerise.F90,module_zero_plumegen_coms.F90,plume_data_mod.F90,rrfs_smoke_config.F90,seas_data_mod.F90,seas_mod.F90,seas_ngac_mod.F90,coarsepm_settling_mod.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/funcphys.f90 b/physics/tools/funcphys.f90 similarity index 100% rename from physics/funcphys.f90 rename to physics/tools/funcphys.f90 diff --git a/physics/get_phi_fv3.F90 b/physics/tools/get_phi_fv3.F90 similarity index 100% rename from physics/get_phi_fv3.F90 rename to physics/tools/get_phi_fv3.F90 diff --git a/physics/get_phi_fv3.meta b/physics/tools/get_phi_fv3.meta similarity index 97% rename from physics/get_phi_fv3.meta rename to physics/tools/get_phi_fv3.meta index cbca14080..5c162c746 100644 --- a/physics/get_phi_fv3.meta +++ b/physics/tools/get_phi_fv3.meta @@ -2,7 +2,7 @@ [ccpp-table-properties] name = get_phi_fv3 type = scheme - dependencies = machine.F,physcons.F90 + dependencies = ../hooks/machine.F,../hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/get_prs_fv3.F90 b/physics/tools/get_prs_fv3.F90 similarity index 100% rename from physics/get_prs_fv3.F90 rename to physics/tools/get_prs_fv3.F90 diff --git a/physics/get_prs_fv3.meta b/physics/tools/get_prs_fv3.meta similarity index 98% rename from physics/get_prs_fv3.meta rename to physics/tools/get_prs_fv3.meta index c26f5c308..4cdad7566 100644 --- a/physics/get_prs_fv3.meta +++ b/physics/tools/get_prs_fv3.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = get_prs_fv3 type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] From 53eda4d0e2af5d8ded2182b08fd9fbafa1b55114 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 5 Sep 2023 15:11:58 +0000 Subject: [PATCH 02/11] Address comments from review. --- physics/CONV/{CCC => C3}/cu_c3_deep.F90 | 0 physics/CONV/{CCC => C3}/cu_c3_driver.F90 | 0 physics/CONV/{CCC => C3}/cu_c3_driver.meta | 0 physics/CONV/{CCC => C3}/cu_c3_driver_post.F90 | 0 physics/CONV/{CCC => C3}/cu_c3_driver_post.meta | 0 physics/CONV/{CCC => C3}/cu_c3_driver_pre.F90 | 0 physics/CONV/{CCC => C3}/cu_c3_driver_pre.meta | 0 physics/CONV/{CCC => C3}/cu_c3_sh.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_common.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_cloud_diagnostics.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_cloud_diagnostics.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_debug.F90 | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_debug.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.fv3.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.fv3.meta | 2 +- .../{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.scm.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.scm.meta | 2 +- .../{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.fv3.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.fv3.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.scm.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.scm.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_radiation_surface.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_radiation_surface.meta | 2 +- .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_post.F90 | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_post.meta | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_pre.F90 | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_pre.meta | 2 +- .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_setup.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_setup.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_mp.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_mp.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_overlap.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_overlap.meta | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_post.meta | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_pre.F90 | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_setup.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_setup.meta | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_stochastics.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_stochastics.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_1.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_1.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_2.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_2.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_3.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_3.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_4.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_4.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_5.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_5.meta | 0 .../GFS_suite_interstitial_phys_reset.F90 | 0 .../GFS_suite_interstitial_phys_reset.meta | 0 .../GFS_suite_interstitial_rad_reset.F90 | 0 .../GFS_suite_interstitial_rad_reset.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_reset.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_reset.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_update.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_update.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_inter.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_inter.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_pre.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_post.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_post.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_pre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_pre.meta | 0 .../GFS_surface_loop_control_part1.F90 | 0 .../GFS_surface_loop_control_part1.meta | 0 .../GFS_surface_loop_control_part2.F90 | 0 .../GFS_surface_loop_control_part2.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.fv3.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.fv3.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.scm.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.scm.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/aerinterp.F90 | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/cnvc90.f | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/cnvc90.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/dcyc2t3.f | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/dcyc2t3.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/gcycle.F90 | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/iccn_def.F | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/iccninterp.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/maximum_hourly_diagnostics.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/maximum_hourly_diagnostics.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/phys_tend.F90 | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/phys_tend.meta | 0 .../{GFS => UFS_SCM_NEPTUNE}/scm_sfc_flux_spec.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/scm_sfc_flux_spec.meta | 0 physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sfcsub.F | 0 .../{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpost.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpost.meta | 0 .../Interstitials/{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpre.F90 | 0 .../{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpre.meta | 0 physics/{MP => SFC_Layer}/GFDL/gfdl_sfc_layer.F90 | 0 physics/{MP => SFC_Layer}/GFDL/gfdl_sfc_layer.meta | 3 ++- physics/SFC_Layer/{GFS_sfc => UFS}/date_def.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_model.f90 | 0 physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_parameters.f90 | 0 physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_water_prop.f90 | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag.meta | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag_post.F90 | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag_post.meta | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diff.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diff.meta | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst.meta | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_post.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_post.meta | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_pre.f | 0 physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_pre.meta | 0 physics/{Land/CLM_lake => SFC_Models/Lake/CLM}/clm_lake.f90 | 0 physics/{Land/CLM_lake => SFC_Models/Lake/CLM}/clm_lake.meta | 0 physics/{Land => SFC_Models/Lake}/Flake/flake.F90 | 0 physics/{Land => SFC_Models/Lake}/Flake/flake_driver.F90 | 0 physics/{Land => SFC_Models/Lake}/Flake/flake_driver.meta | 0 physics/{ => SFC_Models}/Land/Noah/lsm_noah.f | 0 physics/{ => SFC_Models}/Land/Noah/lsm_noah.meta | 0 physics/{ => SFC_Models}/Land/Noah/sflx.f | 0 physics/{ => SFC_Models}/Land/Noah/surface_perturbation.F90 | 0 .../{ => SFC_Models}/Land/Noahmp/module_sf_noahmp_glacier.F90 | 0 physics/{ => SFC_Models}/Land/Noahmp/module_sf_noahmplsm.F90 | 0 physics/{ => SFC_Models}/Land/Noahmp/noahmp_tables.f90 | 0 physics/{ => SFC_Models}/Land/Noahmp/noahmpdrv.F90 | 0 physics/{ => SFC_Models}/Land/Noahmp/noahmpdrv.meta | 0 physics/{ => SFC_Models}/Land/Noahmp/noahmptable.tbl | 0 physics/{ => SFC_Models}/Land/RUC/lsm_ruc.F90 | 0 physics/{ => SFC_Models}/Land/RUC/lsm_ruc.meta | 0 physics/{ => SFC_Models}/Land/RUC/module_sf_ruclsm.F90 | 0 physics/{ => SFC_Models}/Land/RUC/module_soil_pre.F90 | 0 physics/{ => SFC_Models}/Land/RUC/namelist_soilveg_ruc.F90 | 0 physics/{ => SFC_Models}/Land/RUC/set_soilveg_ruc.F90 | 0 physics/{ => SFC_Models}/Land/namelist_soilveg.f | 0 physics/{ => SFC_Models}/Land/set_soilveg.f | 0 .../{SFC_Layer/GFS_sfc => SFC_Models/Ocean/UFS}/sfc_ocean.F | 0 .../{SFC_Layer/GFS_sfc => SFC_Models/Ocean/UFS}/sfc_ocean.meta | 0 .../{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_cice.f | 0 .../GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_cice.meta | 0 .../{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_sice.f | 0 .../GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_sice.meta | 0 163 files changed, 6 insertions(+), 5 deletions(-) rename physics/CONV/{CCC => C3}/cu_c3_deep.F90 (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver.F90 (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver.meta (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver_post.F90 (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver_post.meta (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver_pre.F90 (100%) rename physics/CONV/{CCC => C3}/cu_c3_driver_pre.meta (100%) rename physics/CONV/{CCC => C3}/cu_c3_sh.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_DCNV_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_GWD_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_MP_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_common.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_PBL_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_SCNV_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_cloud_diagnostics.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_cloud_diagnostics.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_debug.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_debug.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.fv3.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.fv3.meta (99%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.scm.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_phys_time_vary.scm.meta (99%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.fv3.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.fv3.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.scm.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rad_time_vary.scm.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_radiation_surface.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_radiation_surface.meta (99%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_pre.meta (99%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_setup.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmg_setup.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_mp.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_mp.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_overlap.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_cloud_overlap.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_setup.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_rrtmgp_setup.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_stochastics.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_stochastics.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_1.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_1.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_2.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_2.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_3.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_3.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_4.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_4.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_5.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_5.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_phys_reset.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_phys_reset.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_rad_reset.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_interstitial_rad_reset.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_reset.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_reset.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_update.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_suite_stateout_update.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_inter.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_inter.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_composites_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_post.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_post.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_pre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_generic_pre.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_loop_control_part1.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_loop_control_part1.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_loop_control_part2.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_surface_loop_control_part2.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.fv3.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.fv3.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.scm.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/GFS_time_vary_pre.scm.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/aerinterp.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/cnvc90.f (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/cnvc90.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/dcyc2t3.f (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/dcyc2t3.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/gcycle.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/iccn_def.F (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/iccninterp.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/maximum_hourly_diagnostics.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/maximum_hourly_diagnostics.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/phys_tend.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/phys_tend.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/scm_sfc_flux_spec.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/scm_sfc_flux_spec.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sfcsub.F (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpost.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpost.meta (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpre.F90 (100%) rename physics/Interstitials/{GFS => UFS_SCM_NEPTUNE}/sgscloud_radpre.meta (100%) rename physics/{MP => SFC_Layer}/GFDL/gfdl_sfc_layer.F90 (100%) rename physics/{MP => SFC_Layer}/GFDL/gfdl_sfc_layer.meta (99%) rename physics/SFC_Layer/{GFS_sfc => UFS}/date_def.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_model.f90 (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_parameters.f90 (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/module_nst_water_prop.f90 (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag.meta (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag_post.F90 (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diag_post.meta (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diff.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_diff.meta (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst.meta (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_post.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_post.meta (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_pre.f (100%) rename physics/SFC_Layer/{GFS_sfc => UFS}/sfc_nst_pre.meta (100%) rename physics/{Land/CLM_lake => SFC_Models/Lake/CLM}/clm_lake.f90 (100%) rename physics/{Land/CLM_lake => SFC_Models/Lake/CLM}/clm_lake.meta (100%) rename physics/{Land => SFC_Models/Lake}/Flake/flake.F90 (100%) rename physics/{Land => SFC_Models/Lake}/Flake/flake_driver.F90 (100%) rename physics/{Land => SFC_Models/Lake}/Flake/flake_driver.meta (100%) rename physics/{ => SFC_Models}/Land/Noah/lsm_noah.f (100%) rename physics/{ => SFC_Models}/Land/Noah/lsm_noah.meta (100%) rename physics/{ => SFC_Models}/Land/Noah/sflx.f (100%) rename physics/{ => SFC_Models}/Land/Noah/surface_perturbation.F90 (100%) rename physics/{ => SFC_Models}/Land/Noahmp/module_sf_noahmp_glacier.F90 (100%) rename physics/{ => SFC_Models}/Land/Noahmp/module_sf_noahmplsm.F90 (100%) rename physics/{ => SFC_Models}/Land/Noahmp/noahmp_tables.f90 (100%) rename physics/{ => SFC_Models}/Land/Noahmp/noahmpdrv.F90 (100%) rename physics/{ => SFC_Models}/Land/Noahmp/noahmpdrv.meta (100%) rename physics/{ => SFC_Models}/Land/Noahmp/noahmptable.tbl (100%) rename physics/{ => SFC_Models}/Land/RUC/lsm_ruc.F90 (100%) rename physics/{ => SFC_Models}/Land/RUC/lsm_ruc.meta (100%) rename physics/{ => SFC_Models}/Land/RUC/module_sf_ruclsm.F90 (100%) rename physics/{ => SFC_Models}/Land/RUC/module_soil_pre.F90 (100%) rename physics/{ => SFC_Models}/Land/RUC/namelist_soilveg_ruc.F90 (100%) rename physics/{ => SFC_Models}/Land/RUC/set_soilveg_ruc.F90 (100%) rename physics/{ => SFC_Models}/Land/namelist_soilveg.f (100%) rename physics/{ => SFC_Models}/Land/set_soilveg.f (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/Ocean/UFS}/sfc_ocean.F (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/Ocean/UFS}/sfc_ocean.meta (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_cice.f (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_cice.meta (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_sice.f (100%) rename physics/{SFC_Layer/GFS_sfc => SFC_Models/SeaIce/CICE}/sfc_sice.meta (100%) diff --git a/physics/CONV/CCC/cu_c3_deep.F90 b/physics/CONV/C3/cu_c3_deep.F90 similarity index 100% rename from physics/CONV/CCC/cu_c3_deep.F90 rename to physics/CONV/C3/cu_c3_deep.F90 diff --git a/physics/CONV/CCC/cu_c3_driver.F90 b/physics/CONV/C3/cu_c3_driver.F90 similarity index 100% rename from physics/CONV/CCC/cu_c3_driver.F90 rename to physics/CONV/C3/cu_c3_driver.F90 diff --git a/physics/CONV/CCC/cu_c3_driver.meta b/physics/CONV/C3/cu_c3_driver.meta similarity index 100% rename from physics/CONV/CCC/cu_c3_driver.meta rename to physics/CONV/C3/cu_c3_driver.meta diff --git a/physics/CONV/CCC/cu_c3_driver_post.F90 b/physics/CONV/C3/cu_c3_driver_post.F90 similarity index 100% rename from physics/CONV/CCC/cu_c3_driver_post.F90 rename to physics/CONV/C3/cu_c3_driver_post.F90 diff --git a/physics/CONV/CCC/cu_c3_driver_post.meta b/physics/CONV/C3/cu_c3_driver_post.meta similarity index 100% rename from physics/CONV/CCC/cu_c3_driver_post.meta rename to physics/CONV/C3/cu_c3_driver_post.meta diff --git a/physics/CONV/CCC/cu_c3_driver_pre.F90 b/physics/CONV/C3/cu_c3_driver_pre.F90 similarity index 100% rename from physics/CONV/CCC/cu_c3_driver_pre.F90 rename to physics/CONV/C3/cu_c3_driver_pre.F90 diff --git a/physics/CONV/CCC/cu_c3_driver_pre.meta b/physics/CONV/C3/cu_c3_driver_pre.meta similarity index 100% rename from physics/CONV/CCC/cu_c3_driver_pre.meta rename to physics/CONV/C3/cu_c3_driver_pre.meta diff --git a/physics/CONV/CCC/cu_c3_sh.F90 b/physics/CONV/C3/cu_c3_sh.F90 similarity index 100% rename from physics/CONV/CCC/cu_c3_sh.F90 rename to physics/CONV/C3/cu_c3_sh.F90 diff --git a/physics/Interstitials/GFS/GFS_DCNV_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_DCNV_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_DCNV_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_DCNV_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_DCNV_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_DCNV_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_DCNV_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_DCNV_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_DCNV_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_GWD_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_GWD_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_GWD_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_GWD_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_GWD_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_GWD_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_GWD_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_GWD_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_GWD_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_MP_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_MP_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_MP_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_MP_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_MP_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_MP_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_MP_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_MP_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_MP_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_PBL_generic_common.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_common.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_PBL_generic_common.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_common.F90 diff --git a/physics/Interstitials/GFS/GFS_PBL_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_PBL_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_PBL_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_PBL_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_PBL_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_PBL_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_PBL_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_PBL_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_PBL_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_SCNV_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_SCNV_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_SCNV_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_SCNV_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_SCNV_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_SCNV_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_SCNV_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_SCNV_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_SCNV_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_cloud_diagnostics.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_cloud_diagnostics.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.F90 diff --git a/physics/Interstitials/GFS/GFS_cloud_diagnostics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_cloud_diagnostics.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_cloud_diagnostics.meta diff --git a/physics/Interstitials/GFS/GFS_debug.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_debug.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.F90 diff --git a/physics/Interstitials/GFS/GFS_debug.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_debug.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta diff --git a/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_phys_time_vary.fv3.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90 diff --git a/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta similarity index 99% rename from physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta index 45125385c..2aec034fd 100644 --- a/physics/Interstitials/GFS/GFS_phys_time_vary.fv3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta @@ -6,7 +6,7 @@ dependencies = Interstitials/GFS/gcycle.F90,Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F dependencies = Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 - dependencies = Land/namelist_soilveg.f,Land/set_soilveg.f,Land/Noahmp/noahmp_tables.f90 + dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 diff --git a/physics/Interstitials/GFS/GFS_phys_time_vary.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_phys_time_vary.scm.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90 diff --git a/physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta similarity index 99% rename from physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta index 84f22aede..d033c889b 100644 --- a/physics/Interstitials/GFS/GFS_phys_time_vary.scm.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta @@ -6,7 +6,7 @@ dependencies = Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F dependencies = Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 - dependencies = Land/namelist_soilveg.f,Land/set_soilveg.f,Land/Noahmp/noahmp_tables.f90 + dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 diff --git a/physics/Interstitials/GFS/GFS_rad_time_vary.fv3.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rad_time_vary.fv3.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.F90 diff --git a/physics/Interstitials/GFS/GFS_rad_time_vary.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rad_time_vary.fv3.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.fv3.meta diff --git a/physics/Interstitials/GFS/GFS_rad_time_vary.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rad_time_vary.scm.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 diff --git a/physics/Interstitials/GFS/GFS_rad_time_vary.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rad_time_vary.scm.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.meta diff --git a/physics/Interstitials/GFS/GFS_radiation_surface.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_radiation_surface.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.F90 diff --git a/physics/Interstitials/GFS/GFS_radiation_surface.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta similarity index 99% rename from physics/Interstitials/GFS/GFS_radiation_surface.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta index c18b81d9f..79837d0bf 100644 --- a/physics/Interstitials/GFS/GFS_radiation_surface.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta @@ -3,7 +3,7 @@ type = scheme relative_path = ../../ dependencies = Radiation/iounitdef.f,Radiation/radiation_surface.f - dependencies = Land/RUC/set_soilveg_ruc.F90,Land/RUC/namelist_soilveg_ruc.F90 + dependencies = SFC_Models/Land/RUC/set_soilveg_ruc.F90,SFC_Models/Land/RUC/namelist_soilveg_ruc.F90 dependencies = hooks/machine.F ######################################################################## diff --git a/physics/Interstitials/GFS/GFS_rrtmg_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmg_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmg_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmg_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmg_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmg_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta similarity index 99% rename from physics/Interstitials/GFS/GFS_rrtmg_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta index e0e67c8f5..af95daf52 100644 --- a/physics/Interstitials/GFS/GFS_rrtmg_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta @@ -7,7 +7,7 @@ dependencies = Radiation/iounitdef.f,Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f dependencies = Radiation/radlw_param.f,Radiation/radsw_param.f,Radiation/radiation_cloud_overlap.F90 - dependencies = Land/Noah/surface_perturbation.F90 + dependencies = SFC_Models/Land/Noah/surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/GFS/GFS_rrtmg_setup.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmg_setup.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmg_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmg_setup.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_cloud_mp.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_mp.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_cloud_overlap.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_cloud_overlap.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_setup.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_setup.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.F90 diff --git a/physics/Interstitials/GFS/GFS_rrtmgp_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_rrtmgp_setup.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta diff --git a/physics/Interstitials/GFS/GFS_stochastics.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_stochastics.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.F90 diff --git a/physics/Interstitials/GFS/GFS_stochastics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_stochastics.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_stochastics.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_1.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_1.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_1.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_1.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_1.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_2.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_2.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_2.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_2.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_2.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_3.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_3.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_3.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_4.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_4.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_4.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_4.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_5.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_5.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_5.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_5.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_5.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_phys_reset.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_phys_reset.meta diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_interstitial_rad_reset.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_rad_reset.meta diff --git a/physics/Interstitials/GFS/GFS_suite_stateout_reset.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_stateout_reset.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_stateout_reset.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_stateout_reset.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_reset.meta diff --git a/physics/Interstitials/GFS/GFS_suite_stateout_update.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_stateout_update.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.F90 diff --git a/physics/Interstitials/GFS/GFS_suite_stateout_update.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_suite_stateout_update.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_stateout_update.meta diff --git a/physics/Interstitials/GFS/GFS_surface_composites_inter.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_inter.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_composites_inter.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_inter.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_inter.meta diff --git a/physics/Interstitials/GFS/GFS_surface_composites_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_composites_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta diff --git a/physics/Interstitials/GFS/GFS_surface_composites_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_composites_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_composites_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta diff --git a/physics/Interstitials/GFS/GFS_surface_generic_post.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_generic_post.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_generic_post.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta diff --git a/physics/Interstitials/GFS/GFS_surface_generic_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_generic_pre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_generic_pre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta diff --git a/physics/Interstitials/GFS/GFS_surface_loop_control_part1.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_loop_control_part1.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_loop_control_part1.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_loop_control_part1.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part1.meta diff --git a/physics/Interstitials/GFS/GFS_surface_loop_control_part2.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_loop_control_part2.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.F90 diff --git a/physics/Interstitials/GFS/GFS_surface_loop_control_part2.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_surface_loop_control_part2.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_loop_control_part2.meta diff --git a/physics/Interstitials/GFS/GFS_time_vary_pre.fv3.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_time_vary_pre.fv3.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.F90 diff --git a/physics/Interstitials/GFS/GFS_time_vary_pre.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_time_vary_pre.fv3.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.fv3.meta diff --git a/physics/Interstitials/GFS/GFS_time_vary_pre.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 similarity index 100% rename from physics/Interstitials/GFS/GFS_time_vary_pre.scm.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.F90 diff --git a/physics/Interstitials/GFS/GFS_time_vary_pre.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta similarity index 100% rename from physics/Interstitials/GFS/GFS_time_vary_pre.scm.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/GFS_time_vary_pre.scm.meta diff --git a/physics/Interstitials/GFS/aerinterp.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/aerinterp.F90 similarity index 100% rename from physics/Interstitials/GFS/aerinterp.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/aerinterp.F90 diff --git a/physics/Interstitials/GFS/cnvc90.f b/physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f similarity index 100% rename from physics/Interstitials/GFS/cnvc90.f rename to physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.f diff --git a/physics/Interstitials/GFS/cnvc90.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.meta similarity index 100% rename from physics/Interstitials/GFS/cnvc90.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/cnvc90.meta diff --git a/physics/Interstitials/GFS/dcyc2t3.f b/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.f similarity index 100% rename from physics/Interstitials/GFS/dcyc2t3.f rename to physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.f diff --git a/physics/Interstitials/GFS/dcyc2t3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta similarity index 100% rename from physics/Interstitials/GFS/dcyc2t3.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/dcyc2t3.meta diff --git a/physics/Interstitials/GFS/gcycle.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90 similarity index 100% rename from physics/Interstitials/GFS/gcycle.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/gcycle.F90 diff --git a/physics/Interstitials/GFS/iccn_def.F b/physics/Interstitials/UFS_SCM_NEPTUNE/iccn_def.F similarity index 100% rename from physics/Interstitials/GFS/iccn_def.F rename to physics/Interstitials/UFS_SCM_NEPTUNE/iccn_def.F diff --git a/physics/Interstitials/GFS/iccninterp.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 similarity index 100% rename from physics/Interstitials/GFS/iccninterp.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 diff --git a/physics/Interstitials/GFS/maximum_hourly_diagnostics.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90 similarity index 100% rename from physics/Interstitials/GFS/maximum_hourly_diagnostics.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.F90 diff --git a/physics/Interstitials/GFS/maximum_hourly_diagnostics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta similarity index 100% rename from physics/Interstitials/GFS/maximum_hourly_diagnostics.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta diff --git a/physics/Interstitials/GFS/phys_tend.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/phys_tend.F90 similarity index 100% rename from physics/Interstitials/GFS/phys_tend.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/phys_tend.F90 diff --git a/physics/Interstitials/GFS/phys_tend.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/phys_tend.meta similarity index 100% rename from physics/Interstitials/GFS/phys_tend.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/phys_tend.meta diff --git a/physics/Interstitials/GFS/scm_sfc_flux_spec.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90 similarity index 100% rename from physics/Interstitials/GFS/scm_sfc_flux_spec.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.F90 diff --git a/physics/Interstitials/GFS/scm_sfc_flux_spec.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.meta similarity index 100% rename from physics/Interstitials/GFS/scm_sfc_flux_spec.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/scm_sfc_flux_spec.meta diff --git a/physics/Interstitials/GFS/sfcsub.F b/physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F similarity index 100% rename from physics/Interstitials/GFS/sfcsub.F rename to physics/Interstitials/UFS_SCM_NEPTUNE/sfcsub.F diff --git a/physics/Interstitials/GFS/sgscloud_radpost.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.F90 similarity index 100% rename from physics/Interstitials/GFS/sgscloud_radpost.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.F90 diff --git a/physics/Interstitials/GFS/sgscloud_radpost.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.meta similarity index 100% rename from physics/Interstitials/GFS/sgscloud_radpost.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpost.meta diff --git a/physics/Interstitials/GFS/sgscloud_radpre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90 similarity index 100% rename from physics/Interstitials/GFS/sgscloud_radpre.F90 rename to physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.F90 diff --git a/physics/Interstitials/GFS/sgscloud_radpre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta similarity index 100% rename from physics/Interstitials/GFS/sgscloud_radpre.meta rename to physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta diff --git a/physics/MP/GFDL/gfdl_sfc_layer.F90 b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90 similarity index 100% rename from physics/MP/GFDL/gfdl_sfc_layer.F90 rename to physics/SFC_Layer/GFDL/gfdl_sfc_layer.F90 diff --git a/physics/MP/GFDL/gfdl_sfc_layer.meta b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta similarity index 99% rename from physics/MP/GFDL/gfdl_sfc_layer.meta rename to physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta index a64fe277c..b0d613eed 100644 --- a/physics/MP/GFDL/gfdl_sfc_layer.meta +++ b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = gfdl_sfc_layer type = scheme - dependencies = ../../hooks/machine.F,../SFC_Layer/module_sf_exchcoef.f90,../../Land/RUC/namelist_soilveg_ruc.F90,../../Land/Noahmp/noahmp_tables.f90 + relative_path = ../../ + dependencies = hooks/machine.F,SFC_Layer/module_sf_exchcoef.f90,SFC_Models/Land/RUC/namelist_soilveg_ruc.F90,Land/Noahmp/noahmp_tables.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Layer/GFS_sfc/date_def.f b/physics/SFC_Layer/UFS/date_def.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/date_def.f rename to physics/SFC_Layer/UFS/date_def.f diff --git a/physics/SFC_Layer/GFS_sfc/module_nst_model.f90 b/physics/SFC_Layer/UFS/module_nst_model.f90 similarity index 100% rename from physics/SFC_Layer/GFS_sfc/module_nst_model.f90 rename to physics/SFC_Layer/UFS/module_nst_model.f90 diff --git a/physics/SFC_Layer/GFS_sfc/module_nst_parameters.f90 b/physics/SFC_Layer/UFS/module_nst_parameters.f90 similarity index 100% rename from physics/SFC_Layer/GFS_sfc/module_nst_parameters.f90 rename to physics/SFC_Layer/UFS/module_nst_parameters.f90 diff --git a/physics/SFC_Layer/GFS_sfc/module_nst_water_prop.f90 b/physics/SFC_Layer/UFS/module_nst_water_prop.f90 similarity index 100% rename from physics/SFC_Layer/GFS_sfc/module_nst_water_prop.f90 rename to physics/SFC_Layer/UFS/module_nst_water_prop.f90 diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diag.f b/physics/SFC_Layer/UFS/sfc_diag.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diag.f rename to physics/SFC_Layer/UFS/sfc_diag.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diag.meta b/physics/SFC_Layer/UFS/sfc_diag.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diag.meta rename to physics/SFC_Layer/UFS/sfc_diag.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diag_post.F90 b/physics/SFC_Layer/UFS/sfc_diag_post.F90 similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diag_post.F90 rename to physics/SFC_Layer/UFS/sfc_diag_post.F90 diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diag_post.meta b/physics/SFC_Layer/UFS/sfc_diag_post.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diag_post.meta rename to physics/SFC_Layer/UFS/sfc_diag_post.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diff.f b/physics/SFC_Layer/UFS/sfc_diff.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diff.f rename to physics/SFC_Layer/UFS/sfc_diff.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_diff.meta b/physics/SFC_Layer/UFS/sfc_diff.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_diff.meta rename to physics/SFC_Layer/UFS/sfc_diff.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst.f b/physics/SFC_Layer/UFS/sfc_nst.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst.f rename to physics/SFC_Layer/UFS/sfc_nst.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst.meta b/physics/SFC_Layer/UFS/sfc_nst.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst.meta rename to physics/SFC_Layer/UFS/sfc_nst.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst_post.f b/physics/SFC_Layer/UFS/sfc_nst_post.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst_post.f rename to physics/SFC_Layer/UFS/sfc_nst_post.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst_post.meta b/physics/SFC_Layer/UFS/sfc_nst_post.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst_post.meta rename to physics/SFC_Layer/UFS/sfc_nst_post.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst_pre.f b/physics/SFC_Layer/UFS/sfc_nst_pre.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst_pre.f rename to physics/SFC_Layer/UFS/sfc_nst_pre.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_nst_pre.meta b/physics/SFC_Layer/UFS/sfc_nst_pre.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_nst_pre.meta rename to physics/SFC_Layer/UFS/sfc_nst_pre.meta diff --git a/physics/Land/CLM_lake/clm_lake.f90 b/physics/SFC_Models/Lake/CLM/clm_lake.f90 similarity index 100% rename from physics/Land/CLM_lake/clm_lake.f90 rename to physics/SFC_Models/Lake/CLM/clm_lake.f90 diff --git a/physics/Land/CLM_lake/clm_lake.meta b/physics/SFC_Models/Lake/CLM/clm_lake.meta similarity index 100% rename from physics/Land/CLM_lake/clm_lake.meta rename to physics/SFC_Models/Lake/CLM/clm_lake.meta diff --git a/physics/Land/Flake/flake.F90 b/physics/SFC_Models/Lake/Flake/flake.F90 similarity index 100% rename from physics/Land/Flake/flake.F90 rename to physics/SFC_Models/Lake/Flake/flake.F90 diff --git a/physics/Land/Flake/flake_driver.F90 b/physics/SFC_Models/Lake/Flake/flake_driver.F90 similarity index 100% rename from physics/Land/Flake/flake_driver.F90 rename to physics/SFC_Models/Lake/Flake/flake_driver.F90 diff --git a/physics/Land/Flake/flake_driver.meta b/physics/SFC_Models/Lake/Flake/flake_driver.meta similarity index 100% rename from physics/Land/Flake/flake_driver.meta rename to physics/SFC_Models/Lake/Flake/flake_driver.meta diff --git a/physics/Land/Noah/lsm_noah.f b/physics/SFC_Models/Land/Noah/lsm_noah.f similarity index 100% rename from physics/Land/Noah/lsm_noah.f rename to physics/SFC_Models/Land/Noah/lsm_noah.f diff --git a/physics/Land/Noah/lsm_noah.meta b/physics/SFC_Models/Land/Noah/lsm_noah.meta similarity index 100% rename from physics/Land/Noah/lsm_noah.meta rename to physics/SFC_Models/Land/Noah/lsm_noah.meta diff --git a/physics/Land/Noah/sflx.f b/physics/SFC_Models/Land/Noah/sflx.f similarity index 100% rename from physics/Land/Noah/sflx.f rename to physics/SFC_Models/Land/Noah/sflx.f diff --git a/physics/Land/Noah/surface_perturbation.F90 b/physics/SFC_Models/Land/Noah/surface_perturbation.F90 similarity index 100% rename from physics/Land/Noah/surface_perturbation.F90 rename to physics/SFC_Models/Land/Noah/surface_perturbation.F90 diff --git a/physics/Land/Noahmp/module_sf_noahmp_glacier.F90 b/physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90 similarity index 100% rename from physics/Land/Noahmp/module_sf_noahmp_glacier.F90 rename to physics/SFC_Models/Land/Noahmp/module_sf_noahmp_glacier.F90 diff --git a/physics/Land/Noahmp/module_sf_noahmplsm.F90 b/physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90 similarity index 100% rename from physics/Land/Noahmp/module_sf_noahmplsm.F90 rename to physics/SFC_Models/Land/Noahmp/module_sf_noahmplsm.F90 diff --git a/physics/Land/Noahmp/noahmp_tables.f90 b/physics/SFC_Models/Land/Noahmp/noahmp_tables.f90 similarity index 100% rename from physics/Land/Noahmp/noahmp_tables.f90 rename to physics/SFC_Models/Land/Noahmp/noahmp_tables.f90 diff --git a/physics/Land/Noahmp/noahmpdrv.F90 b/physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 similarity index 100% rename from physics/Land/Noahmp/noahmpdrv.F90 rename to physics/SFC_Models/Land/Noahmp/noahmpdrv.F90 diff --git a/physics/Land/Noahmp/noahmpdrv.meta b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta similarity index 100% rename from physics/Land/Noahmp/noahmpdrv.meta rename to physics/SFC_Models/Land/Noahmp/noahmpdrv.meta diff --git a/physics/Land/Noahmp/noahmptable.tbl b/physics/SFC_Models/Land/Noahmp/noahmptable.tbl similarity index 100% rename from physics/Land/Noahmp/noahmptable.tbl rename to physics/SFC_Models/Land/Noahmp/noahmptable.tbl diff --git a/physics/Land/RUC/lsm_ruc.F90 b/physics/SFC_Models/Land/RUC/lsm_ruc.F90 similarity index 100% rename from physics/Land/RUC/lsm_ruc.F90 rename to physics/SFC_Models/Land/RUC/lsm_ruc.F90 diff --git a/physics/Land/RUC/lsm_ruc.meta b/physics/SFC_Models/Land/RUC/lsm_ruc.meta similarity index 100% rename from physics/Land/RUC/lsm_ruc.meta rename to physics/SFC_Models/Land/RUC/lsm_ruc.meta diff --git a/physics/Land/RUC/module_sf_ruclsm.F90 b/physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90 similarity index 100% rename from physics/Land/RUC/module_sf_ruclsm.F90 rename to physics/SFC_Models/Land/RUC/module_sf_ruclsm.F90 diff --git a/physics/Land/RUC/module_soil_pre.F90 b/physics/SFC_Models/Land/RUC/module_soil_pre.F90 similarity index 100% rename from physics/Land/RUC/module_soil_pre.F90 rename to physics/SFC_Models/Land/RUC/module_soil_pre.F90 diff --git a/physics/Land/RUC/namelist_soilveg_ruc.F90 b/physics/SFC_Models/Land/RUC/namelist_soilveg_ruc.F90 similarity index 100% rename from physics/Land/RUC/namelist_soilveg_ruc.F90 rename to physics/SFC_Models/Land/RUC/namelist_soilveg_ruc.F90 diff --git a/physics/Land/RUC/set_soilveg_ruc.F90 b/physics/SFC_Models/Land/RUC/set_soilveg_ruc.F90 similarity index 100% rename from physics/Land/RUC/set_soilveg_ruc.F90 rename to physics/SFC_Models/Land/RUC/set_soilveg_ruc.F90 diff --git a/physics/Land/namelist_soilveg.f b/physics/SFC_Models/Land/namelist_soilveg.f similarity index 100% rename from physics/Land/namelist_soilveg.f rename to physics/SFC_Models/Land/namelist_soilveg.f diff --git a/physics/Land/set_soilveg.f b/physics/SFC_Models/Land/set_soilveg.f similarity index 100% rename from physics/Land/set_soilveg.f rename to physics/SFC_Models/Land/set_soilveg.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_ocean.F b/physics/SFC_Models/Ocean/UFS/sfc_ocean.F similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_ocean.F rename to physics/SFC_Models/Ocean/UFS/sfc_ocean.F diff --git a/physics/SFC_Layer/GFS_sfc/sfc_ocean.meta b/physics/SFC_Models/Ocean/UFS/sfc_ocean.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_ocean.meta rename to physics/SFC_Models/Ocean/UFS/sfc_ocean.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_cice.f b/physics/SFC_Models/SeaIce/CICE/sfc_cice.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_cice.f rename to physics/SFC_Models/SeaIce/CICE/sfc_cice.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_cice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_cice.meta rename to physics/SFC_Models/SeaIce/CICE/sfc_cice.meta diff --git a/physics/SFC_Layer/GFS_sfc/sfc_sice.f b/physics/SFC_Models/SeaIce/CICE/sfc_sice.f similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_sice.f rename to physics/SFC_Models/SeaIce/CICE/sfc_sice.f diff --git a/physics/SFC_Layer/GFS_sfc/sfc_sice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta similarity index 100% rename from physics/SFC_Layer/GFS_sfc/sfc_sice.meta rename to physics/SFC_Models/SeaIce/CICE/sfc_sice.meta From 5592fc4fe88ac2c704eccf6fa01b8ff875135726 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 19 Oct 2023 17:42:47 +0000 Subject: [PATCH 03/11] Metafile cleanup --- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta | 8 ++++---- .../UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta | 3 ++- .../UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta | 4 ++-- .../UFS_SCM_NEPTUNE/GFS_radiation_surface.meta | 2 +- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta | 2 +- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta | 6 +++--- .../Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta | 6 +++--- .../Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta | 2 +- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta | 2 +- .../Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta | 2 +- .../Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta | 2 +- .../Morrison_Gettelman}/aerinterp.F90 | 0 physics/h2o_photo/h2o_def.meta | 2 +- physics/o3_photo/ozne_def.meta | 2 +- 14 files changed, 22 insertions(+), 21 deletions(-) rename physics/{Interstitials/UFS_SCM_NEPTUNE => MP/Morrison_Gettelman}/aerinterp.F90 (100%) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta index de3f49a6f..10eb43671 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_debug.meta @@ -200,7 +200,7 @@ [ccpp-table-properties] name = GFS_interstitialtoscreen type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] @@ -399,7 +399,7 @@ [ccpp-table-properties] name = GFS_abort type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] @@ -439,7 +439,7 @@ [ccpp-table-properties] name = GFS_checkland type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] @@ -698,7 +698,7 @@ [ccpp-table-properties] name = GFS_checktracers type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta index 2aec034fd..7df4cf715 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta @@ -3,7 +3,8 @@ type = scheme relative_path = ../../ dependencies = hooks/machine.F - dependencies = Interstitials/GFS/gcycle.F90,Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F + dependencies = Interstitials/UFS_SCM_NEPTUNE/gcycle.F90,Interstitials/UFS_SCM_NEPTUNE/iccn_def.F + dependencies = Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90,Interstitials/UFS_SCM_NEPTUNE/sfcsub.F dependencies = Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta index d033c889b..e1de4d699 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta @@ -3,8 +3,8 @@ type = scheme relative_path = ../../ dependencies = hooks/machine.F - dependencies = Interstitials/GFS/iccn_def.F,Interstitials/GFS/iccninterp.F90,Interstitials/GFS/sfcsub.F - dependencies = Radiation/mersenne_twister.f + dependencies = Interstitials/UFS_SCM_NEPTUNE/iccn_def.F,Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 + dependencies = Interstitials/UFS_SCM_NEPTUNE/sfcsub.F,Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta index 79837d0bf..686bd3c6c 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta @@ -2,7 +2,7 @@ name = GFS_radiation_surface type = scheme relative_path = ../../ - dependencies = Radiation/iounitdef.f,Radiation/radiation_surface.f + dependencies = Radiation/radiation_surface.f dependencies = SFC_Models/Land/RUC/set_soilveg_ruc.F90,SFC_Models/Land/RUC/namelist_soilveg_ruc.F90 dependencies = hooks/machine.F diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta index c84b9da31..b387c3e33 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_post.meta @@ -3,7 +3,7 @@ type = scheme relative_path = ../../ dependencies = hooks/machine.F - dependencies = Radiation/iounitdef.f,Radiation/radiation_aerosols.f,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f + dependencies = Radiation/radiation_aerosols.f,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta index af95daf52..72495eac5 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta @@ -3,10 +3,10 @@ type = scheme relative_path = ../../ dependencies = tools/funcphys.f90,hooks/machine.F - dependencies = MP/Thompson/module_mp_thompson.F90,MP/Thompsonmodule_mp_thompson_make_number_concentrations.F90 - dependencies = Radiation/iounitdef.f,Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f + dependencies = MP/Thompson/module_mp_thompson.F90,MP/Thompson/module_mp_thompson_make_number_concentrations.F90 + dependencies = Radiation/RRTMG/radcons.f90,Radiation/radiation_aerosols.f dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f - dependencies = Radiation/radlw_param.f,Radiation/radsw_param.f,Radiation/radiation_cloud_overlap.F90 + dependencies = Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_param.f,Radiation/radiation_cloud_overlap.F90 dependencies = SFC_Models/Land/Noah/surface_perturbation.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta index 0c199deaa..a9fbf91d9 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_setup.meta @@ -3,9 +3,9 @@ type = scheme relative_path = ../../ dependencies = hooks/machine.F - dependencies = Radiaiton/iounitdef.f,Radiaiton/RRTMG/radcons.f90,Radiaiton/radiation_aerosols.f - dependencies = Radiaiton/radiation_astronomy.f,Radiaiton/radiation_clouds.f,Radiaiton/radiation_gases.f - dependencies = Radiaiton/radlw_main.F90,Radiaiton/radlw_param.f,Radiaiton/radsw_main.F90,Radiaiton/radsw_param.f + dependencies = Radiation/radiation_aerosols.f + dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_clouds.f,Radiation/radiation_gases.f + dependencies = Radiation/RRTMG/radlw_main.F90,Radiation/RRTMG/radlw_param.f,Radiation/RRTMG/radsw_main.F90,Radiation/RRTMG/radsw_param.f dependencies = MP/Thompson/module_mp_thompson.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta index c21c2ef7c..5b355849a 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_post.meta @@ -2,7 +2,7 @@ name = GFS_rrtmgp_post type = scheme relative_path = ../../ - dependencies = Radiation/iounitdef.f,hooks/machine.F,Radiation/radiation_aerosols.f + dependencies = hooks/machine.F,Radiation/radiation_aerosols.f dependencies = Radiation/RRTMG/radlw_param.f,Radiation/radiation_tools.F90,Radiation/RRTMGP/rte-rrtmgp/extensions/mo_heating_rates.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta index ae67ef51b..ddc95c55c 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta @@ -2,7 +2,7 @@ name = GFS_rrtmgp_pre type = scheme relative_path = ../../ - dependencies = tools/funcphys.f90,hooks/machine.F,Radiation/iounitdef.f,Radiation/radiation_aerosols.f + dependencies = tools/funcphys.f90,hooks/machine.F,Radiation/radiation_aerosols.f dependencies = Radiation/radiation_astronomy.f,Radiation/radiation_gases.f,Radiation/radiation_tools.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta index 5d21e1910..14c1f91cd 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_setup.meta @@ -3,7 +3,7 @@ type = scheme relative_path = ../../ dependencies = hooks/machine.F,MP/Thompson/module_mp_thompson.F90 - dependencies = Radiation/iounitdef.f,Radiation/radiation_aerosols.f + dependencies = Radiation/radiation_aerosols.f dependencies = Radiation/radiation_gases.f,Radiation/radiation_astronomy.f ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta index c9fd5950c..9829e3538 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta @@ -2,7 +2,7 @@ name = sgscloud_radpre type = scheme relative_path = ../../ - dependencies = tools/funcphys.f90,Radiation/iounitdef.f,hooks/machine.F,hooks/physcons.F90 + dependencies = tools/funcphys.f90,hooks/machine.F,hooks/physcons.F90 dependencies = hooks/physcons.F90,Radiation/RRTMG/radcons.f90 dependencies = Radiation/radiation_clouds.f,MP/Thompson/module_mp_thompson.F90 diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/aerinterp.F90 b/physics/MP/Morrison_Gettelman/aerinterp.F90 similarity index 100% rename from physics/Interstitials/UFS_SCM_NEPTUNE/aerinterp.F90 rename to physics/MP/Morrison_Gettelman/aerinterp.F90 diff --git a/physics/h2o_photo/h2o_def.meta b/physics/h2o_photo/h2o_def.meta index 3bb9bf94d..92e1d61bd 100644 --- a/physics/h2o_photo/h2o_def.meta +++ b/physics/h2o_photo/h2o_def.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = h2o_def type = module - dependencies = ../../hooks/machine.F + dependencies = ../hooks/machine.F [ccpp-arg-table] name = h2o_def diff --git a/physics/o3_photo/ozne_def.meta b/physics/o3_photo/ozne_def.meta index 3123892bb..bdb51ce8d 100644 --- a/physics/o3_photo/ozne_def.meta +++ b/physics/o3_photo/ozne_def.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozne_def type = module - dependencies = ../../hooks/machine.F + dependencies = ../hooks/machine.F [ccpp-arg-table] name = ozne_def From e627b189236c8ddc7d6a41683e1526b458413336 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 19 Oct 2023 17:51:25 +0000 Subject: [PATCH 04/11] Move rte-rrtmgp submodule --- .gitmodules | 3 +++ physics/Radiation/RRTMGP/rte-rrtmgp | 1 + 2 files changed, 4 insertions(+) create mode 160000 physics/Radiation/RRTMGP/rte-rrtmgp diff --git a/.gitmodules b/.gitmodules index c82541c5b..24b9cf118 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,6 @@ path = physics/Radiation/RRTMGP/rte-rrtmgp url = https://github.com/earth-system-radiation/rte-rrtmgp branch = main +[submodule "physics/Radiation/RRTMGP/rte-rrtmgp"] + path = physics/Radiation/RRTMGP/rte-rrtmgp + url = https://github.com/earth-system-radiation/rte-rrtmgp diff --git a/physics/Radiation/RRTMGP/rte-rrtmgp b/physics/Radiation/RRTMGP/rte-rrtmgp new file mode 160000 index 000000000..74a0e098b --- /dev/null +++ b/physics/Radiation/RRTMGP/rte-rrtmgp @@ -0,0 +1 @@ +Subproject commit 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 From f7edbc1db5595cf58370713a50abdd1ba3bd5eda Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 26 Oct 2023 16:49:24 +0000 Subject: [PATCH 05/11] More cleanup --- physics/CONV/C3/cu_c3_driver.meta | 3 +- physics/CONV/Grell_Freitas/cu_gf_driver.meta | 3 +- .../GFS_phys_time_vary.fv3.meta | 4 +- .../GFS_phys_time_vary.scm.meta | 4 +- .../GFS_surface_composites_post.meta | 2 +- .../GFS_surface_generic_pre.meta | 2 +- .../UFS_SCM_NEPTUNE/sgscloud_radpre.meta | 2 +- physics/MP/Morrison_Gettelman/m_micro.meta | 4 +- physics/NOTUSED/gfs_phy_tracer_config.F | 228 ------------------ physics/NOTUSED/gocart_tracer_config_stub.f | 17 -- physics/NOTUSED/rrtmg_lw_pre.F90 | 26 -- physics/NOTUSED/rrtmg_lw_pre.meta | 24 -- .../RRTMGP/rrtmgp_aerosol_optics.meta | 2 +- physics/Radiation/RRTMGP/rrtmgp_lw_main.meta | 2 +- physics/Radiation/RRTMGP/rrtmgp_sw_main.meta | 2 +- physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta | 5 +- .../GFDL/module_sf_exchcoef.f90 | 0 physics/SFC_Layer/MYJ/myjsfc_wrapper.meta | 2 +- physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta | 2 +- physics/SFC_Layer/UFS/sfc_diag.meta | 2 +- physics/SFC_Models/Lake/CLM/clm_lake.meta | 2 +- .../SFC_Models/Lake/Flake/flake_driver.meta | 2 +- physics/SFC_Models/Land/Noah/lsm_noah.meta | 2 +- physics/SFC_Models/Land/Noahmp/noahmpdrv.meta | 3 +- physics/SFC_Models/Land/RUC/lsm_ruc.meta | 3 +- physics/SFC_Models/Ocean/UFS/sfc_ocean.meta | 2 +- physics/SFC_Models/SeaIce/CICE/sfc_cice.meta | 2 +- physics/SFC_Models/SeaIce/CICE/sfc_sice.meta | 2 +- physics/{h2o_photo => photochem}/h2o_def.f | 0 physics/{h2o_photo => photochem}/h2o_def.meta | 0 .../{h2o_photo => photochem}/h2ointerp.f90 | 0 physics/{h2o_photo => photochem}/h2ophys.f | 0 physics/{h2o_photo => photochem}/h2ophys.meta | 2 +- physics/{o3_photo => photochem}/ozinterp.f90 | 0 physics/{o3_photo => photochem}/ozne_def.f | 0 physics/{o3_photo => photochem}/ozne_def.meta | 0 physics/{o3_photo => photochem}/ozphys.f | 0 physics/{o3_photo => photochem}/ozphys.meta | 2 +- physics/{o3_photo => photochem}/ozphys_2015.f | 0 .../{o3_photo => photochem}/ozphys_2015.meta | 2 +- physics/smoke_dust/rrfs_smoke_postpbl.meta | 2 +- physics/smoke_dust/rrfs_smoke_wrapper.meta | 2 +- 42 files changed, 38 insertions(+), 326 deletions(-) delete mode 100644 physics/NOTUSED/gfs_phy_tracer_config.F delete mode 100644 physics/NOTUSED/gocart_tracer_config_stub.f delete mode 100644 physics/NOTUSED/rrtmg_lw_pre.F90 delete mode 100644 physics/NOTUSED/rrtmg_lw_pre.meta rename physics/{MP => SFC_Layer}/GFDL/module_sf_exchcoef.f90 (100%) rename physics/{h2o_photo => photochem}/h2o_def.f (100%) rename physics/{h2o_photo => photochem}/h2o_def.meta (100%) rename physics/{h2o_photo => photochem}/h2ointerp.f90 (100%) rename physics/{h2o_photo => photochem}/h2ophys.f (100%) rename physics/{h2o_photo => photochem}/h2ophys.meta (98%) rename physics/{o3_photo => photochem}/ozinterp.f90 (100%) rename physics/{o3_photo => photochem}/ozne_def.f (100%) rename physics/{o3_photo => photochem}/ozne_def.meta (100%) rename physics/{o3_photo => photochem}/ozphys.f (100%) rename physics/{o3_photo => photochem}/ozphys.meta (99%) rename physics/{o3_photo => photochem}/ozphys_2015.f (100%) rename physics/{o3_photo => photochem}/ozphys_2015.meta (99%) diff --git a/physics/CONV/C3/cu_c3_driver.meta b/physics/CONV/C3/cu_c3_driver.meta index bb2784642..da3ccc6dd 100644 --- a/physics/CONV/C3/cu_c3_driver.meta +++ b/physics/CONV/C3/cu_c3_driver.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = cu_c3_driver type = scheme - dependencies = cu_c3_deep.F90,cu_c3_sh.F90,../../hooks/machine.F,../../hooks/physcons.F90,../progsigma_calc.f90 + dependencies = ../../hooks/machine.F + dependencies = cu_c3_deep.F90,cu_c3_sh.F90,../progsigma_calc.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/CONV/Grell_Freitas/cu_gf_driver.meta b/physics/CONV/Grell_Freitas/cu_gf_driver.meta index db2973c0f..87add2809 100644 --- a/physics/CONV/Grell_Freitas/cu_gf_driver.meta +++ b/physics/CONV/Grell_Freitas/cu_gf_driver.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = cu_gf_driver type = scheme - dependencies = cu_gf_deep.F90,cu_gf_sh.F90,../../hooks/machine.F,../../hooks/physcons.F90 + dependencies = ../../hooks/machine.F + dependencies = cu_gf_deep.F90,cu_gf_sh.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta index 7df4cf715..8a35d469c 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta @@ -8,8 +8,8 @@ dependencies = Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 - dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f - dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 + dependencies = photochem/ozinterp.f90,photochem/ozne_def.f + dependencies = photochem/h2o_def.f,photochem/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta index e1de4d699..86c052b0e 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta @@ -7,8 +7,8 @@ dependencies = Interstitials/UFS_SCM_NEPTUNE/sfcsub.F,Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 - dependencies = o3_photo/ozinterp.f90,o3_photo/ozne_def.f - dependencies = h2o_photo/h2o_def.f,h2o_photo/h2ointerp.f90 + dependencies = photochem/ozinterp.f90,photochem/ozne_def.f + dependencies = photochem/h2o_def.f,photochem/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 ######################################################################## diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta index 35b54544a..7224d7221 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_post.meta @@ -3,7 +3,7 @@ name = GFS_surface_composites_post type = scheme relative_path = ../../ - dependencies = hooks/machine.F,SFC_Layer/GFS_sfc/sfc_diff.f + dependencies = hooks/machine.F,SFC_Layer/UFS/sfc_diff.f ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta index 63fb9b96c..bbf7dd5c3 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_pre.meta @@ -2,7 +2,7 @@ name = GFS_surface_generic_pre type = scheme relative_path = ../../ - dependencies = hooks/machine.F,Land/Noah/surface_perturbation.F90 + dependencies = hooks/machine.F,SFC_Models/Land/Noah/surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta index 9829e3538..a9635efa5 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/sgscloud_radpre.meta @@ -2,7 +2,7 @@ name = sgscloud_radpre type = scheme relative_path = ../../ - dependencies = tools/funcphys.f90,hooks/machine.F,hooks/physcons.F90 + dependencies = tools/funcphys.f90,hooks/machine.F dependencies = hooks/physcons.F90,Radiation/RRTMG/radcons.f90 dependencies = Radiation/radiation_clouds.f,MP/Thompson/module_mp_thompson.F90 diff --git a/physics/MP/Morrison_Gettelman/m_micro.meta b/physics/MP/Morrison_Gettelman/m_micro.meta index 4b6df18c7..16efc5cc4 100644 --- a/physics/MP/Morrison_Gettelman/m_micro.meta +++ b/physics/MP/Morrison_Gettelman/m_micro.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = m_micro type = scheme - dependencies = ../../hooks/machine.F,../../hooks/physcons.F90,aer_cloud.F,aerclm_def.F,cldmacro.F,cldwat2m_micro.F,micro_mg_utils.F90,micro_mg2_0.F90,micro_mg3_0.F90,wv_saturation.F + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90 + dependencies = aer_cloud.F,aerclm_def.F,cldmacro.F,cldwat2m_micro.F + dependencies = micro_mg_utils.F90,micro_mg2_0.F90,micro_mg3_0.F90,wv_saturation.F ######################################################################## [ccpp-arg-table] diff --git a/physics/NOTUSED/gfs_phy_tracer_config.F b/physics/NOTUSED/gfs_phy_tracer_config.F deleted file mode 100644 index 647919a23..000000000 --- a/physics/NOTUSED/gfs_phy_tracer_config.F +++ /dev/null @@ -1,228 +0,0 @@ - -! -!! ! Module: gfs_phy_tracer_config -! -! ! Description: gfs physics tracer configuration module -! -! ! Revision history: -! Oct 16 2009 Sarah Lu, adopted from dyn fc -! Nov 21 2009 Sarah Lu, chem tracer specified from ChemRegistry -! Dec 10 2009 Sarah Lu, add doing_GOCART -! Jan 12 2010 Sarah Lu, add trcindx -! Feb 08 2009 Sarah Lu, ri/cpi added to gfs_phy_tracer_type -! Aug 17 2010 Sarah Lu, remove debug print -! Oct 16 2010 Sarah Lu, add fscav -! Aug 08 2011 Jun Wang, remove gocart dependency when not running GOCART -! Sep 17 2011 Sarah Lu, revise chem tracer initialization -! Nov 11 2011 Sarah Lu, allocate but not assign value for cpi/ri array -! Apr 06 2012 Henry Juang, relax hardwire num_tracer, add tracer 4 and 5 -! Apr 23 2012 Jun Wang, remove save attibute for gfs_phy_tracer (already defined) -! --- -- 2016 Anning Cheng add ntiw,ntlnc,ntinc -! May 03 2016 S Moorthi add nto, nto2 -! ------------------------------------------------------------------------- -! - module gfs_phy_tracer_config - use machine , only : kind_phys - - implicit none - SAVE -! -! tracer specification: add fscav -! - type gfs_phy_tracer_type - character*20 , pointer :: chem_name(:) ! chem_tracer name - character*20 , pointer :: vname(:) ! variable name - real(kind=kind_phys), pointer :: ri(:) - real(kind=kind_phys), pointer :: cpi(:) - real(kind=kind_phys), pointer :: fscav(:) - integer :: ntrac, ntrac_met, ntrac_chem - logical :: doing_DU, doing_SU, doing_SS - &, doing_OC, doing_BC, doing_GOCART - endtype gfs_phy_tracer_type - - type (gfs_phy_tracer_type) :: gfs_phy_tracer -! -! misc tracer options -! - logical :: glbsum = .true. -! - -! --- public interface - public tracer_config_init, trcindx - - contains - -! ------------------------------------------------------------------- -! ------------------------------------------------------------------- -! subroutine tracer_config_init (gfs_phy_tracer,ntrac, - subroutine tracer_config_init (ntrac,ntoz,ntcw,ncld, - & ntiw,ntlnc,ntinc, - & fprcp,ntrw,ntsw,ntrnc,ntsnc, - & ntke,nto,nto2,me) - -c -c This subprogram sets up gfs_phy_tracer -c - implicit none -! input - integer, intent(in) :: me, ntoz,ntcw,ntke, - & ntiw,ntlnc,ntinc,nto,nto2, - & fprcp,ntrw,ntsw,ntrnc,ntsnc -! output -! type (gfs_phy_tracer_type), intent(out) :: gfs_phy_tracer -! input/output - integer, intent(inout) :: ntrac -! local - integer :: i, j, status, ierr - character*20 :: rgname - -! initialize ntrac_chem (the default is no chemistry) - gfs_phy_tracer%ntrac_chem = 0 - gfs_phy_tracer%doing_GOCART = .false. - -! initialize chem tracers - call gocart_tracer_config(me) - -! input ntrac is meteorological tracers - gfs_phy_tracer%ntrac_met = ntrac - -! update ntrac = total number of tracers - gfs_phy_tracer%ntrac = gfs_phy_tracer%ntrac_met + - & gfs_phy_tracer%ntrac_chem - ntrac = gfs_phy_tracer%ntrac - - if(me==0) then - print *, 'LU_TRCp: ntrac_met =',gfs_phy_tracer%ntrac_met - print *, 'LU_TRCp: ntrac_chem=',gfs_phy_tracer%ntrac_chem - print *, 'LU_TRCp: ntrac =',gfs_phy_tracer%ntrac - endif - -! Set up tracer name, cpi, and ri - if ( gfs_phy_tracer%ntrac > 0 ) then - allocate(gfs_phy_tracer%vname(ntrac), stat=status) - if( status /= 0 ) then - print *,'LU_TRC: alloc error - gfs_dyn_tracer :',status,me - return - endif - allocate(gfs_phy_tracer%ri(0:ntrac), stat=status) - if( status /= 0 ) then - print *,'LU_TRC: alloc error - gfs_dyn_tracer :',status,me - return - endif - allocate(gfs_phy_tracer%cpi(0:ntrac), stat=status) - if( status /= 0 ) then - print *,'LU_TRC: alloc error - gfs_dyn_tracer :',status,me - return - endif - allocate(gfs_phy_tracer%fscav(ntrac), stat=status) - if( status /= 0 ) then - print *,'LU_TRC: alloc error - gfs_dyn_tracer :',status,me - return - endif - -!--- fill in met tracers - gfs_phy_tracer%vname(1) = 'spfh' - if(ntcw > 0) gfs_phy_tracer%vname(ntcw) = 'clwmr' - if(ntiw > 0) gfs_phy_tracer%vname(ntiw) = 'climr' - if(ntlnc > 0) gfs_phy_tracer%vname(ntlnc) = 'lnc' - if(ntinc > 0) gfs_phy_tracer%vname(ntinc) = 'inc' - if(ntrw > 0) gfs_phy_tracer%vname(ntrw) = 'rnmr' - if(ntsw > 0) gfs_phy_tracer%vname(ntsw) = 'snwmr' - if(ntrnc > 0) gfs_phy_tracer%vname(ntrnc) = 'rnc' - if(ntsnc > 0) gfs_phy_tracer%vname(ntsnc) = 'snc' - if(ntke > 0) gfs_phy_tracer%vname(ntke) = 'tke' -#ifdef MULTI_GASES - print *,' ++++ ntoz nto nto2 ',ntoz,nto,nto2 - if(ntoz > 0) gfs_phy_tracer%vname(ntoz) = 'spo3' - if(nto > 0) gfs_phy_tracer%vname(nto) = 'spo' - if(nto2 > 0) gfs_phy_tracer%vname(nto2) = 'spo2' -#else - if(ntoz > 0) gfs_phy_tracer%vname(ntoz) = 'o3mr' - if(nto > 0) gfs_phy_tracer%vname(nto) = 'o' - if(nto2 > 0) gfs_phy_tracer%vname(nto2) = 'o2' -#endif - - - gfs_phy_tracer%fscav(1:gfs_phy_tracer%ntrac_met) = 0. - -!--- fill in chem tracers - if ( gfs_phy_tracer%ntrac_chem > 0 ) then - do i = 1,gfs_phy_tracer%ntrac_chem - j = i + gfs_phy_tracer%ntrac_met - rgname = trim(gfs_phy_tracer%chem_name(i)) - if(me==0)print *, 'LU_TRC_phy: vname=',j,rgname - gfs_phy_tracer%vname(j) = rgname - enddo - endif - - endif !! - - return - - end subroutine tracer_config_init -! ------------------------------------------------------------------- -! ------------------------------------------------------------------- - function trcindx( specname, tracer ) - implicit none - - character*(*), intent(in) :: specname - type (gfs_phy_tracer_type), intent(in) :: tracer - - character*10 :: name1, name2 - integer :: i, trcindx - -! -- set default value - trcindx = -999 - -! -- convert specname to upper case - call fixchar(specname, name1, 1) - do i = 1, tracer%ntrac - call fixchar(tracer%vname(i), name2, 1) - if( name1 == name2 ) then - trcindx = i - exit - endif - enddo - - return - end function trcindx - -! ------------------------------------------------------------------- - subroutine fixchar(name_in, name_out, option) - implicit none - - character*(*), intent(in) :: name_in - character*(*), intent(out) :: name_out - integer, intent(in) :: option - - character*10 :: temp - integer :: i, ic - - name_out= ' ' - temp = trim(adjustl(name_in)) - do i = 1, len_trim(temp) - ic = IACHAR(temp(i:i)) - if(option == 1 ) then !<--- convert to upper case - if(ic .ge. 97 .and. ic .le. 122) then - name_out(i:i) = CHAR( IC-32 ) - else - name_out(i:i) = temp(i:i) - endif - endif - if(option == 2 ) then !<--- convert to lower case - if(ic .ge. 65 .and. ic .le. 90) then - name_out(i:i) = CHAR( IC+32 ) - else - name_out(i:i) = temp(i:i) - endif - endif - - enddo - name_out = trim(name_out) - return - - end subroutine fixchar - -! ========================================================================= - - end module gfs_phy_tracer_config diff --git a/physics/NOTUSED/gocart_tracer_config_stub.f b/physics/NOTUSED/gocart_tracer_config_stub.f deleted file mode 100644 index d6df297c7..000000000 --- a/physics/NOTUSED/gocart_tracer_config_stub.f +++ /dev/null @@ -1,17 +0,0 @@ -! -!! ! Subroutine : gocart_tracer_config -! -! ! Description: stub for resetting gfs phys when gocart is running -! -! ! Revision history: -! Aug 09 2011 Jun Wang, initial code -! ------------------------------------------------------------------------- -! - subroutine gocart_tracer_config() -! - -! print *,'TRAC_CONFIG: gocart is not running.' - - return - - end subroutine gocart_tracer_config diff --git a/physics/NOTUSED/rrtmg_lw_pre.F90 b/physics/NOTUSED/rrtmg_lw_pre.F90 deleted file mode 100644 index 2b63d98c5..000000000 --- a/physics/NOTUSED/rrtmg_lw_pre.F90 +++ /dev/null @@ -1,26 +0,0 @@ -!>\file rrtmg_lw_pre.F90 -!! - module rrtmg_lw_pre - contains - -!>\defgroup rrtmg_lw_pre GFS RRTMG-LW scheme pre -!! This module contains RRTMG-LW pre module. -!> @{ -!> \section arg_table_rrtmg_lw_pre_run Argument Table -!! \htmlinclude rrtmg_lw_pre_run.html -!! - subroutine rrtmg_lw_pre_run (errmsg, errflg) - - implicit none - - character(len=*), intent( out) :: errmsg - integer, intent( out) :: errflg - - ! Initialize CCPP error handling variables - errmsg = '' - errflg = 0 - - end subroutine rrtmg_lw_pre_run - -!> @} - end module rrtmg_lw_pre diff --git a/physics/NOTUSED/rrtmg_lw_pre.meta b/physics/NOTUSED/rrtmg_lw_pre.meta deleted file mode 100644 index 9f6ec07c8..000000000 --- a/physics/NOTUSED/rrtmg_lw_pre.meta +++ /dev/null @@ -1,24 +0,0 @@ -[ccpp-table-properties] - name = rrtmg_lw_pre - type = scheme - dependencies = - -######################################################################## -[ccpp-arg-table] - name = rrtmg_lw_pre_run - type = scheme -[errmsg] - standard_name = ccpp_error_message - long_name = error message for error handling in CCPP - units = none - dimensions = () - type = character - kind = len=* - intent = out -[errflg] - standard_name = ccpp_error_code - long_name = error code for error handling in CCPP - units = 1 - dimensions = () - type = integer - intent = out diff --git a/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta index 0847877d6..37ec2e9a0 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_aerosol_optics.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrtmgp_aerosol_optics type = scheme - dependencies = ../iounitdef.f,../../hooks/machine.F,../radiation_aerosols.f,../radiation_tools.F90 + dependencies = ../../hooks/machine.F,../radiation_aerosols.f,../radiation_tools.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta index 011376985..779389581 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_lw_main.meta @@ -7,7 +7,7 @@ dependencies = rte-rrtmgp/rte/mo_source_functions.F90,rte-rrtmgp/rte/mo_rte_lw.F90,rte-rrtmgp/rte/mo_fluxes.F90 dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 dependencies = rrtmgp_lw_gas_optics.F90, rrtmgp_lw_cloud_optics.F90,rrtmgp_sampling.F90 - dependencies = ../../GFS/GFS_rrtmgp_pre.F90 + dependencies = ../../Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta index 932e2195e..711d01bc1 100644 --- a/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta +++ b/physics/Radiation/RRTMGP/rrtmgp_sw_main.meta @@ -7,7 +7,7 @@ dependencies = rte-rrtmgp/rte/mo_rte_sw.F90,rte-rrtmgp/rte/mo_fluxes.F90 dependencies = rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90, rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 dependencies = rrtmgp_sw_gas_optics.F90, rrtmgp_sw_cloud_optics.F90,rrtmgp_sampling.F90 - dependencies = ../../GFS/GFS_rrtmgp_pre.F90 + dependencies = ../../Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta index b0d613eed..ac98437e9 100644 --- a/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta +++ b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta @@ -1,8 +1,9 @@ [ccpp-table-properties] name = gfdl_sfc_layer type = scheme - relative_path = ../../ - dependencies = hooks/machine.F,SFC_Layer/module_sf_exchcoef.f90,SFC_Models/Land/RUC/namelist_soilveg_ruc.F90,Land/Noahmp/noahmp_tables.f90 + dependencies = ../../hooks/machine.F,module_sf_exchcoef.f90 + dependencies = ../../SFC_Models/Land/RUC/namelist_soilveg_ruc.F90 + dependencies = ../../SFC_Models/Land/Noahmp/noahmp_tables.f90 ######################################################################## [ccpp-arg-table] diff --git a/physics/MP/GFDL/module_sf_exchcoef.f90 b/physics/SFC_Layer/GFDL/module_sf_exchcoef.f90 similarity index 100% rename from physics/MP/GFDL/module_sf_exchcoef.f90 rename to physics/SFC_Layer/GFDL/module_sf_exchcoef.f90 diff --git a/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta b/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta index 9805db619..0ae09985e 100644 --- a/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta +++ b/physics/SFC_Layer/MYJ/myjsfc_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = myjsfc_wrapper type = scheme - dependencies = ../../hooks/machine.f,module_SF_JSFC.F90 + dependencies = ../../hooks/machine.F,module_SF_JSFC.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta b/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta index a76df3790..0e1c96c02 100644 --- a/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta +++ b/physics/SFC_Layer/MYNN/mynnsfc_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = mynnsfc_wrapper type = scheme - dependencies = ../../hooks/machine.F,module_sf_mynn.F90 + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90,module_sf_mynn.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Layer/UFS/sfc_diag.meta b/physics/SFC_Layer/UFS/sfc_diag.meta index 6a82c2c61..f4f83ab04 100644 --- a/physics/SFC_Layer/UFS/sfc_diag.meta +++ b/physics/SFC_Layer/UFS/sfc_diag.meta @@ -2,7 +2,7 @@ name = sfc_diag type = scheme relative_path = ../../ - dependencies = tools/funcphys.f90,hooks/machine.F + dependencies = tools/funcphys.f90,hooks/machine.F,hooks/physcons.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.meta b/physics/SFC_Models/Lake/CLM/clm_lake.meta index 3a519244a..a02aee9c6 100644 --- a/physics/SFC_Models/Lake/CLM/clm_lake.meta +++ b/physics/SFC_Models/Lake/CLM/clm_lake.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = clm_lake type = scheme - dependencies = ../../hooks/machine.F + dependencies = ../../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.meta b/physics/SFC_Models/Lake/Flake/flake_driver.meta index 8b295bc27..22ab62d1e 100644 --- a/physics/SFC_Models/Lake/Flake/flake_driver.meta +++ b/physics/SFC_Models/Lake/Flake/flake_driver.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = flake_driver type = scheme - dependencies = ../../hooks/machine.F,flake.F90 + dependencies = ../../../hooks/machine.F,flake.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Land/Noah/lsm_noah.meta b/physics/SFC_Models/Land/Noah/lsm_noah.meta index 2dc612d5b..07f4045a2 100644 --- a/physics/SFC_Models/Land/Noah/lsm_noah.meta +++ b/physics/SFC_Models/Land/Noah/lsm_noah.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = lsm_noah type = scheme - dependencies = ../../tools/funcphys.f90,../../hooks/machine.F + dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F dependencies = ../set_soilveg.f,sflx.f,surface_perturbation.F90 ######################################################################## diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta index 55a787cd7..e7a73ef99 100644 --- a/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta +++ b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = noahmpdrv type = scheme - dependencies = ../../tools/funcphys.f90,../../hooks/machine.F,module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90,../set_soilveg.f + dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F + dependencies = module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90,../set_soilveg.f ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Land/RUC/lsm_ruc.meta b/physics/SFC_Models/Land/RUC/lsm_ruc.meta index f02d6de67..c05eb30e8 100644 --- a/physics/SFC_Models/Land/RUC/lsm_ruc.meta +++ b/physics/SFC_Models/Land/RUC/lsm_ruc.meta @@ -1,7 +1,8 @@ [ccpp-table-properties] name = lsm_ruc type = scheme - dependencies = ../../hooks/machine.F,module_sf_ruclsm.F90,module_soil_pre.F90,namelist_soilveg_ruc.F90,set_soilveg_ruc.F90 + dependencies = ../../../hooks/machine.F,../../../hooks/physcons.F90 + dependencies = module_sf_ruclsm.F90,module_soil_pre.F90,namelist_soilveg_ruc.F90,set_soilveg_ruc.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Ocean/UFS/sfc_ocean.meta b/physics/SFC_Models/Ocean/UFS/sfc_ocean.meta index ea575a071..848c2e3ed 100644 --- a/physics/SFC_Models/Ocean/UFS/sfc_ocean.meta +++ b/physics/SFC_Models/Ocean/UFS/sfc_ocean.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sfc_ocean type = scheme - dependencies = ../../tools/funcphys.f90,../../hooks/machine.F + dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta index 52fa28a3d..c44f9d6b5 100644 --- a/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta +++ b/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sfc_cice type = scheme - relative_path = ../../ + relative_path = ../../../ dependencies = hooks/machine.F ######################################################################## diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta index 7277c0511..828a83939 100644 --- a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta +++ b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = sfc_sice type = scheme - relative_path = ../../ + relative_path = ../../../ dependencies = tools/funcphys.f90,hooks/machine.F ######################################################################## diff --git a/physics/h2o_photo/h2o_def.f b/physics/photochem/h2o_def.f similarity index 100% rename from physics/h2o_photo/h2o_def.f rename to physics/photochem/h2o_def.f diff --git a/physics/h2o_photo/h2o_def.meta b/physics/photochem/h2o_def.meta similarity index 100% rename from physics/h2o_photo/h2o_def.meta rename to physics/photochem/h2o_def.meta diff --git a/physics/h2o_photo/h2ointerp.f90 b/physics/photochem/h2ointerp.f90 similarity index 100% rename from physics/h2o_photo/h2ointerp.f90 rename to physics/photochem/h2ointerp.f90 diff --git a/physics/h2o_photo/h2ophys.f b/physics/photochem/h2ophys.f similarity index 100% rename from physics/h2o_photo/h2ophys.f rename to physics/photochem/h2ophys.f diff --git a/physics/h2o_photo/h2ophys.meta b/physics/photochem/h2ophys.meta similarity index 98% rename from physics/h2o_photo/h2ophys.meta rename to physics/photochem/h2ophys.meta index d8a9eabab..9e9b03647 100644 --- a/physics/h2o_photo/h2ophys.meta +++ b/physics/photochem/h2ophys.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = h2ophys type = scheme - dependencies = ../../hooks/machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/o3_photo/ozinterp.f90 b/physics/photochem/ozinterp.f90 similarity index 100% rename from physics/o3_photo/ozinterp.f90 rename to physics/photochem/ozinterp.f90 diff --git a/physics/o3_photo/ozne_def.f b/physics/photochem/ozne_def.f similarity index 100% rename from physics/o3_photo/ozne_def.f rename to physics/photochem/ozne_def.f diff --git a/physics/o3_photo/ozne_def.meta b/physics/photochem/ozne_def.meta similarity index 100% rename from physics/o3_photo/ozne_def.meta rename to physics/photochem/ozne_def.meta diff --git a/physics/o3_photo/ozphys.f b/physics/photochem/ozphys.f similarity index 100% rename from physics/o3_photo/ozphys.f rename to physics/photochem/ozphys.f diff --git a/physics/o3_photo/ozphys.meta b/physics/photochem/ozphys.meta similarity index 99% rename from physics/o3_photo/ozphys.meta rename to physics/photochem/ozphys.meta index 631dcb332..a1f7e4eb2 100644 --- a/physics/o3_photo/ozphys.meta +++ b/physics/photochem/ozphys.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozphys type = scheme - dependencies = ../../hooks/machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/o3_photo/ozphys_2015.f b/physics/photochem/ozphys_2015.f similarity index 100% rename from physics/o3_photo/ozphys_2015.f rename to physics/photochem/ozphys_2015.f diff --git a/physics/o3_photo/ozphys_2015.meta b/physics/photochem/ozphys_2015.meta similarity index 99% rename from physics/o3_photo/ozphys_2015.meta rename to physics/photochem/ozphys_2015.meta index 7da8cdf27..632dbc340 100644 --- a/physics/o3_photo/ozphys_2015.meta +++ b/physics/photochem/ozphys_2015.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = ozphys_2015 type = scheme - dependencies = ../../hooks/machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/smoke_dust/rrfs_smoke_postpbl.meta b/physics/smoke_dust/rrfs_smoke_postpbl.meta index 339f6ca03..e65d182d3 100755 --- a/physics/smoke_dust/rrfs_smoke_postpbl.meta +++ b/physics/smoke_dust/rrfs_smoke_postpbl.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrfs_smoke_postpbl type = scheme - dependencies = machine.F + dependencies = ../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta index b084cdd66..b079b12c9 100755 --- a/physics/smoke_dust/rrfs_smoke_wrapper.meta +++ b/physics/smoke_dust/rrfs_smoke_wrapper.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = rrfs_smoke_wrapper type = scheme - dependencies = machine.F,dep_dry_mod.F90,module_wetdep_ls.F90,dust_data_mod.F90,dust_fengsha_mod.F90,module_add_emiss_burn.F90,module_plumerise1.F90,module_smoke_plumerise.F90,module_zero_plumegen_coms.F90,plume_data_mod.F90,rrfs_smoke_config.F90,seas_data_mod.F90,seas_mod.F90,seas_ngac_mod.F90,coarsepm_settling_mod.F90 + dependencies = ../hooks/machine.F,dep_dry_mod.F90,module_wetdep_ls.F90,dust_data_mod.F90,dust_fengsha_mod.F90,module_add_emiss_burn.F90,module_plumerise1.F90,module_smoke_plumerise.F90,module_zero_plumegen_coms.F90,plume_data_mod.F90,rrfs_smoke_config.F90,seas_data_mod.F90,seas_mod.F90,seas_ngac_mod.F90,coarsepm_settling_mod.F90 ######################################################################## [ccpp-arg-table] From d4835d1bfe04f1dd3753f08b9d7f1baa37942a1f Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Mon, 30 Oct 2023 19:31:09 +0000 Subject: [PATCH 06/11] Address reviewers comments. --- CMakeLists.txt | 54 +++++++++---------- physics/SFC_Models/Land/Noah/lsm_noah.meta | 2 +- .../Land/{ => Noah}/namelist_soilveg.f | 0 .../SFC_Models/Land/{ => Noah}/set_soilveg.f | 0 physics/SFC_Models/Land/Noahmp/noahmpdrv.meta | 3 +- 5 files changed, 30 insertions(+), 29 deletions(-) rename physics/SFC_Models/Land/{ => Noah}/namelist_soilveg.f (100%) rename physics/SFC_Models/Land/{ => Noah}/set_soilveg.f (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 97591a2ee..bac0637a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -79,37 +79,37 @@ get_filename_component(LOCAL_CURRENT_SOURCE_DIR ${FULL_PATH_TO_CMAKELISTS} DIREC #------------------------------------------------------------------------------ # List of files that need to be compiled without OpenMP -set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_byband.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/solar_variability/mo_solar_variability.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_heating_rates.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/mo_compute_bc.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_config.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_source_functions.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_sw.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_fluxes.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_lw.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_util_array.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_rte_kind.F90 - ${LOCAL_CURRENT_SOURCE_DIR}/physics/rte-rrtmgp/rte/mo_optical_props.F90) +set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_optics.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_rrtmgp_constants.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_rrtmgp_util_string.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/kernels/mo_gas_optics_kernels.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_rrtmgp_clr_all_sky.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_fluxes_byband.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/solar_variability/mo_solar_variability.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_heating_rates.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_fluxes_bygpoint.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/mo_compute_bc.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/cloud_optics/mo_cloud_sampling.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_config.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_source_functions.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_sw.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_fluxes.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_lw.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_util_array.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_rte_solver_kernels.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_optical_props_kernels.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/kernels/mo_fluxes_broadband_kernels.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_rte_kind.F90 + ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte-rrtmgp/rte/mo_optical_props.F90) # List of files that need to be compiled with different precision set(SCHEMES_DYNAMICS) -if(${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90 IN_LIST SCHEMES) - list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/fv_sat_adj.F90) +if(${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90fv_sat_adj.F90 IN_LIST SCHEMES) + list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90/fv_sat_adj.F90) endif() # Remove files that need to be compiled with different precision diff --git a/physics/SFC_Models/Land/Noah/lsm_noah.meta b/physics/SFC_Models/Land/Noah/lsm_noah.meta index 07f4045a2..44cb6aa5b 100644 --- a/physics/SFC_Models/Land/Noah/lsm_noah.meta +++ b/physics/SFC_Models/Land/Noah/lsm_noah.meta @@ -2,7 +2,7 @@ name = lsm_noah type = scheme dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F - dependencies = ../set_soilveg.f,sflx.f,surface_perturbation.F90 + dependencies = set_soilveg.f,sflx.f,surface_perturbation.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Land/namelist_soilveg.f b/physics/SFC_Models/Land/Noah/namelist_soilveg.f similarity index 100% rename from physics/SFC_Models/Land/namelist_soilveg.f rename to physics/SFC_Models/Land/Noah/namelist_soilveg.f diff --git a/physics/SFC_Models/Land/set_soilveg.f b/physics/SFC_Models/Land/Noah/set_soilveg.f similarity index 100% rename from physics/SFC_Models/Land/set_soilveg.f rename to physics/SFC_Models/Land/Noah/set_soilveg.f diff --git a/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta index e7a73ef99..64372bdb8 100644 --- a/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta +++ b/physics/SFC_Models/Land/Noahmp/noahmpdrv.meta @@ -2,7 +2,8 @@ name = noahmpdrv type = scheme dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F - dependencies = module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90,../set_soilveg.f + dependencies = module_sf_noahmp_glacier.F90,module_sf_noahmplsm.F90,noahmp_tables.f90 + dependencies = ../Noah/set_soilveg.f ######################################################################## [ccpp-arg-table] From 1d3118299e53cf4a6d25367f27caefbe586d2909 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 31 Oct 2023 02:42:41 +0000 Subject: [PATCH 07/11] More metatdata changes --- .../Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta | 2 +- .../Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta index 8a35d469c..f35510ed2 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.meta @@ -7,7 +7,7 @@ dependencies = Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90,Interstitials/UFS_SCM_NEPTUNE/sfcsub.F dependencies = Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 - dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 + dependencies = SFC_Models/Land/Noah/namelist_soilveg.f,SFC_Models/Land/Noah/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 dependencies = photochem/ozinterp.f90,photochem/ozne_def.f dependencies = photochem/h2o_def.f,photochem/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta index 86c052b0e..c885e7c2a 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.meta @@ -6,7 +6,7 @@ dependencies = Interstitials/UFS_SCM_NEPTUNE/iccn_def.F,Interstitials/UFS_SCM_NEPTUNE/iccninterp.F90 dependencies = Interstitials/UFS_SCM_NEPTUNE/sfcsub.F,Radiation/mersenne_twister.f dependencies = MP/Morrison_Gettelman/aerclm_def.F,MP/Morrison_Gettelman/aerinterp.F90 - dependencies = SFC_Models/Land/namelist_soilveg.f,SFC_Models/Land/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 + dependencies = SFC_Models/Land/Noah/namelist_soilveg.f,SFC_Models/Land/Noah/set_soilveg.f,SFC_Models/Land/Noahmp/noahmp_tables.f90 dependencies = photochem/ozinterp.f90,photochem/ozne_def.f dependencies = photochem/h2o_def.f,photochem/h2ointerp.f90 dependencies = GWD/cires_tauamf_data.F90 From 1fb6b842b4952a37d61426fbd2876d6d8f8ab15a Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Tue, 28 Nov 2023 17:01:03 +0000 Subject: [PATCH 08/11] Bug fix in metadata --- physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.meta | 2 +- physics/MP/GFDL/gfdl_cloud_microphys.meta | 4 +++- physics/MP/Thompson/mp_thompson.meta | 4 +++- physics/MP/{Thompson => }/module_mp_radar.F90 | 0 4 files changed, 7 insertions(+), 3 deletions(-) rename physics/MP/{Thompson => }/module_mp_radar.F90 (100%) diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.meta index 5701909fd..758b9d8b8 100644 --- a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.meta +++ b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_physics_post.meta @@ -1,7 +1,7 @@ [ccpp-table-properties] name = GFS_physics_post type = scheme - dependencies = machine.F + dependencies = ../../hooks/machine.F ######################################################################## [ccpp-arg-table] diff --git a/physics/MP/GFDL/gfdl_cloud_microphys.meta b/physics/MP/GFDL/gfdl_cloud_microphys.meta index 35b216d4a..719a340e5 100644 --- a/physics/MP/GFDL/gfdl_cloud_microphys.meta +++ b/physics/MP/GFDL/gfdl_cloud_microphys.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = gfdl_cloud_microphys type = scheme - dependencies = ../../hooks/machine.F,module_gfdl_cloud_microphys.F90 + dependencies = ../../hooks/machine.F + dependencies = ../module_mp_radar.F90 + dependencies = module_gfdl_cloud_microphys.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/MP/Thompson/mp_thompson.meta b/physics/MP/Thompson/mp_thompson.meta index be0720531..ffe34bafb 100644 --- a/physics/MP/Thompson/mp_thompson.meta +++ b/physics/MP/Thompson/mp_thompson.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = mp_thompson type = scheme - dependencies = ../../hooks/machine.F,module_mp_radar.F90,module_mp_thompson.F90,module_mp_thompson_make_number_concentrations.F90 + dependencies = ../../hooks/machine.F + dependencies = ../module_mp_radar.F90 + dependencies = module_mp_thompson.F90,module_mp_thompson_make_number_concentrations.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/MP/Thompson/module_mp_radar.F90 b/physics/MP/module_mp_radar.F90 similarity index 100% rename from physics/MP/Thompson/module_mp_radar.F90 rename to physics/MP/module_mp_radar.F90 From 8180a05c4c44af50767d3cd32c724a9de6f2d21e Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 7 Dec 2023 16:59:57 +0000 Subject: [PATCH 09/11] Omission from previous merge --- physics/SFC_Layer/UFS/sfc_nst.f | 696 ------------------- physics/{ => SFC_Layer/UFS}/sfc_nst.f90 | 0 physics/SFC_Layer/UFS/sfc_nst_post.f | 93 --- physics/{ => SFC_Layer/UFS}/sfc_nst_post.f90 | 0 physics/SFC_Layer/UFS/sfc_nst_pre.f | 96 --- physics/{ => SFC_Layer/UFS}/sfc_nst_pre.f90 | 0 6 files changed, 885 deletions(-) delete mode 100644 physics/SFC_Layer/UFS/sfc_nst.f rename physics/{ => SFC_Layer/UFS}/sfc_nst.f90 (100%) delete mode 100644 physics/SFC_Layer/UFS/sfc_nst_post.f rename physics/{ => SFC_Layer/UFS}/sfc_nst_post.f90 (100%) delete mode 100644 physics/SFC_Layer/UFS/sfc_nst_pre.f rename physics/{ => SFC_Layer/UFS}/sfc_nst_pre.f90 (100%) diff --git a/physics/SFC_Layer/UFS/sfc_nst.f b/physics/SFC_Layer/UFS/sfc_nst.f deleted file mode 100644 index 2ca70666d..000000000 --- a/physics/SFC_Layer/UFS/sfc_nst.f +++ /dev/null @@ -1,696 +0,0 @@ -!>\file sfc_nst.f -!! This file contains the GFS NSST model. - -!> This module contains the CCPP-compliant GFS near-surface sea temperature scheme. - module sfc_nst - - contains - -!>\defgroup gfs_nst_main_mod GFS Near-Surface Sea Temperature Module -!! This module contains the CCPP-compliant GFS near-surface sea temperature scheme. -!> @{ -!! This subroutine calls the Thermal Skin-layer and Diurnal Thermocline models to update the NSST profile. -!! \section arg_table_sfc_nst_run Argument Table -!! \htmlinclude sfc_nst_run.html -!! -!> \section NSST_general_algorithm GFS Near-Surface Sea Temperature Scheme General Algorithm - subroutine sfc_nst_run & - & ( im, hvap, cp, hfus, jcal, eps, epsm1, rvrdm1, rd, rhw0, & ! --- inputs: - & pi, tgice, sbc, ps, u1, v1, t1, q1, tref, cm, ch, & - & lseaspray, fm, fm10, & - & prsl1, prslki, prsik1, prslk1, wet, use_lake_model, xlon, & - & sinlat, stress, & - & sfcemis, dlwflx, sfcnsw, rain, timestep, kdt, solhr,xcosz, & - & wind, flag_iter, flag_guess, nstf_name1, nstf_name4, & - & nstf_name5, lprnt, ipr, thsfc_loc, & - & tskin, tsurf, xt, xs, xu, xv, xz, zm, xtts, xzts, dt_cool, & ! --- input/output: - & z_c, c_0, c_d, w_0, w_d, d_conv, ifd, qrain, & - & qsurf, gflux, cmm, chh, evap, hflx, ep, errmsg, errflg & ! --- outputs: - & ) -! -! ===================================================================== ! -! description: ! -! ! -! ! -! usage: ! -! ! -! call sfc_nst ! -! inputs: ! -! ( im, ps, u1, v1, t1, q1, tref, cm, ch, ! -! lseaspray, fm, fm10, ! -! prsl1, prslki, wet, use_lake_model, xlon, sinlat, stress, ! -! sfcemis, dlwflx, sfcnsw, rain, timestep, kdt,solhr,xcosz, ! -! wind, flag_iter, flag_guess, nstf_name1, nstf_name4, ! -! nstf_name5, lprnt, ipr, thsfc_loc, ! -! input/outputs: ! -! tskin, tsurf, xt, xs, xu, xv, xz, zm, xtts, xzts, dt_cool, ! -! z_c, c_0, c_d, w_0, w_d, d_conv, ifd, qrain, ! -! -- outputs: -! qsurf, gflux, cmm, chh, evap, hflx, ep ! -! ) -! ! -! ! -! subprogram/functions called: w3movdat, iw3jdn, fpvs, density, ! -! rhocoef, cool_skin, warm_layer, jacobi_temp. ! -! ! -! program history log: ! -! 2007 -- xu li createad original code ! -! 2008 -- s. moorthi adapted to the parallel version ! -! may 2009 -- y.-t. hou modified to include input lw surface ! -! emissivity from radiation. also replaced the ! -! often comfusing combined sw and lw suface ! -! flux with separate sfc net sw flux (defined ! -! as dn-up) and lw flux. added a program doc block. ! -! sep 2009 -- s. moorthi removed rcl and additional reformatting ! -! and optimization + made pa as input pressure unit.! -! 2009 -- xu li recreatead the code ! -! feb 2010 -- s. moorthi added some changes made to the previous ! -! version ! -! Jul 2016 -- X. Li, modify the diurnal warming event reset ! -! ! -! ! -! ==================== definition of variables ==================== ! -! ! -! inputs: size ! -! im - integer, horiz dimension 1 ! -! ps - real, surface pressure (pa) im ! -! u1, v1 - real, u/v component of surface layer wind (m/s) im ! -! t1 - real, surface layer mean temperature ( k ) im ! -! q1 - real, surface layer mean specific humidity im ! -! tref - real, reference/foundation temperature ( k ) im ! -! cm - real, surface exchange coeff for momentum (m/s) im ! -! ch - real, surface exchange coeff heat & moisture(m/s) im ! -! lseaspray- logical, .t. for parameterization for sea spray 1 ! -! fm - real, a stability profile function for momentum im ! -! fm10 - real, a stability profile function for momentum im ! -! at 10m ! -! prsl1 - real, surface layer mean pressure (pa) im ! -! prslki - real, im ! -! prsik1 - real, im ! -! prslk1 - real, im ! -! wet - logical, =T if any ocn/lake water (F otherwise) im ! -! use_lake_model- logical, =T if flake model is used for lake im ! -! icy - logical, =T if any ice im ! -! xlon - real, longitude (radians) im ! -! sinlat - real, sin of latitude im ! -! stress - real, wind stress (n/m**2) im ! -! sfcemis - real, sfc lw emissivity (fraction) im ! -! dlwflx - real, total sky sfc downward lw flux (w/m**2) im ! -! sfcnsw - real, total sky sfc netsw flx into ocean (w/m**2) im ! -! rain - real, rainfall rate (kg/m**2/s) im ! -! timestep - real, timestep interval (second) 1 ! -! kdt - integer, time step counter 1 ! -! solhr - real, fcst hour at the end of prev time step 1 ! -! xcosz - real, consine of solar zenith angle 1 ! -! wind - real, wind speed (m/s) im ! -! flag_iter- logical, execution or not im ! -! when iter = 1, flag_iter = .true. for all grids im ! -! when iter = 2, flag_iter = .true. when wind < 2 im ! -! for both land and ocean (when nstf_name1 > 0) im ! -! flag_guess-logical, .true.= guess step to get CD et al im ! -! when iter = 1, flag_guess = .true. when wind < 2 im ! -! when iter = 2, flag_guess = .false. for all grids im ! -! nstf_name - integers , NSST related flag parameters 1 ! -! nstf_name1 : 0 = NSSTM off 1 ! -! 1 = NSSTM on but uncoupled 1 ! -! 2 = NSSTM on and coupled 1 ! -! nstf_name4 : zsea1 in mm 1 ! -! nstf_name5 : zsea2 in mm 1 ! -! lprnt - logical, control flag for check print out 1 ! -! ipr - integer, grid index for check print out 1 ! -! thsfc_loc- logical, flag for reference pressure in theta 1 ! -! ! -! input/outputs: -! li added for oceanic components -! tskin - real, ocean surface skin temperature ( k ) im ! -! tsurf - real, the same as tskin ( k ) but for guess run im ! -! xt - real, heat content in dtl im ! -! xs - real, salinity content in dtl im ! -! xu - real, u-current content in dtl im ! -! xv - real, v-current content in dtl im ! -! xz - real, dtl thickness im ! -! zm - real, mxl thickness im ! -! xtts - real, d(xt)/d(ts) im ! -! xzts - real, d(xz)/d(ts) im ! -! dt_cool - real, sub-layer cooling amount im ! -! d_conv - real, thickness of free convection layer (fcl) im ! -! z_c - sub-layer cooling thickness im ! -! c_0 - coefficient1 to calculate d(tz)/d(ts) im ! -! c_d - coefficient2 to calculate d(tz)/d(ts) im ! -! w_0 - coefficient3 to calculate d(tz)/d(ts) im ! -! w_d - coefficient4 to calculate d(tz)/d(ts) im ! -! ifd - real, index to start dtlm run or not im ! -! qrain - real, sensible heat flux due to rainfall (watts) im ! - -! outputs: ! - -! qsurf - real, surface air saturation specific humidity im ! -! gflux - real, soil heat flux (w/m**2) im ! -! cmm - real, im ! -! chh - real, im ! -! evap - real, evaperation from latent heat flux im ! -! hflx - real, sensible heat flux im ! -! ep - real, potential evaporation im ! -! ! -! ===================================================================== ! - use machine , only : kind_phys - use funcphys, only : fpvs - use date_def, only : idate - use module_nst_water_prop, only: get_dtzm_point - use module_nst_parameters, only : t0k,cp_w,omg_m,omg_sh, & - & sigma_r,solar_time_6am,ri_c,z_w_max,delz,wd_max, & - & rad2deg,const_rot,tau_min,tw_max,sst_max - use module_nst_water_prop, only: solar_time_from_julian, & - & density,rhocoef,compjd,grv & - &, sw_ps_9b - use nst_module, only : cool_skin,dtm_1p,cal_w,cal_ttop, & - & convdepth,dtm_1p_fca,dtm_1p_tla, & - & dtm_1p_mwa,dtm_1p_mda,dtm_1p_mta, & - & dtl_reset -! - implicit none - - integer, parameter :: kp = kind_phys -! -! --- constant parameters: - real (kind=kind_phys), parameter :: f24 = 24.0_kp ! hours/day - real (kind=kind_phys), parameter :: f1440 = 1440.0_kp ! minutes/day - real (kind=kind_phys), parameter :: czmin = 0.0001_kp ! cos(89.994) - real (kind=kind_phys), parameter :: zero = 0.0_kp, one = 1.0_kp - - -! --- inputs: - integer, intent(in) :: im, kdt, ipr, nstf_name1, nstf_name4, & - & nstf_name5 - real (kind=kind_phys), intent(in) :: hvap, cp, hfus, jcal, eps, & - & epsm1, rvrdm1, rd, rhw0, sbc, pi, tgice - real (kind=kind_phys), dimension(:), intent(in) :: ps, u1, v1, & - & t1, q1, tref, cm, ch, fm, fm10, & - & prsl1, prslki, prsik1, prslk1, xlon, xcosz, & - & sinlat, stress, sfcemis, dlwflx, sfcnsw, rain, wind - real (kind=kind_phys), intent(in) :: timestep - real (kind=kind_phys), intent(in) :: solhr - -! For sea spray effect - logical, intent(in) :: lseaspray -! - logical, dimension(:), intent(in) :: flag_iter, flag_guess, wet - integer, dimension(:), intent(in) :: use_lake_model -! &, icy - logical, intent(in) :: lprnt - logical, intent(in) :: thsfc_loc - -! --- input/outputs: -! control variables of dtl system (5+2) and sl (2) and coefficients for d(tz)/d(ts) calculation - real (kind=kind_phys), dimension(:), intent(inout) :: tskin, & - & tsurf, xt, xs, xu, xv, xz, zm, xtts, xzts, dt_cool, & - & z_c, c_0, c_d, w_0, w_d, d_conv, ifd, qrain - -! --- outputs: - real (kind=kind_phys), dimension(:), intent(inout) :: & - & qsurf, gflux, cmm, chh, evap, hflx, ep - - character(len=*), intent(out) :: errmsg - integer, intent(out) :: errflg - -! -! locals -! - integer :: k,i -! - real (kind=kind_phys), dimension(im) :: q0, qss, rch, - & rho_a, theta1, tv1, wndmag - - real(kind=kind_phys) elocp,tem,cpinv,hvapi -! -! nstm related prognostic fields -! - logical flag(im) - real (kind=kind_phys), dimension(im) :: - & xt_old, xs_old, xu_old, xv_old, xz_old,zm_old,xtts_old, - & xzts_old, ifd_old, tref_old, tskin_old, dt_cool_old,z_c_old - - real(kind=kind_phys) ulwflx(im), nswsfc(im) -! real(kind=kind_phys) rig(im), -! & ulwflx(im),dlwflx(im), -! & slrad(im),nswsfc(im) - real(kind=kind_phys) alpha,beta,rho_w,f_nsol,sss,sep, - & cosa,sina,taux,tauy,grav,dz,t0,ttop0,ttop - - real(kind=kind_phys) le,fc,dwat,dtmp,wetc,alfac,ustar_a,rich - real(kind=kind_phys) rnl_ts,hs_ts,hl_ts,rf_ts,q_ts - real(kind=kind_phys) fw,q_warm - real(kind=kind_phys) t12,alon,tsea,sstc,dta,dtz - real(kind=kind_phys) zsea1,zsea2,soltim - logical do_nst - -! external functions called: iw3jdn - integer :: iw3jdn -! -! parameters for sea spray effect -! - real (kind=kind_phys) :: f10m, u10m, v10m, ws10, ru10, qss1, - & bb1, hflxs, evaps, ptem -! -! real (kind=kind_phys), parameter :: alps=0.5, bets=0.5, gams=0.1, -! real (kind=kind_phys), parameter :: alps=0.5, bets=0.5, gams=0.0, -! real (kind=kind_phys), parameter :: alps=1.0, bets=1.0, gams=0.2, - real (kind=kind_phys), parameter :: alps=0.75,bets=0.75,gams=0.15, - & ws10cr=30., conlf=7.2e-9, consf=6.4e-8 -! -!====================================================================================================== -cc - ! Initialize CCPP error handling variables - errmsg = '' - errflg = 0 - - if (nstf_name1 == 0) return ! No NSST model used - - cpinv = one/cp - hvapi = one/hvap - elocp = hvap/cp - - sss = 34.0_kp ! temporarily, when sea surface salinity data is not ready -! -! flag for open water and where the iteration is on -! - do_nst = .false. - do i = 1, im -! flag(i) = wet(i) .and. .not.icy(i) .and. flag_iter(i) - flag(i) = wet(i) .and. flag_iter(i) .and. use_lake_model(i)/=1 - do_nst = do_nst .or. flag(i) - enddo - if (.not. do_nst) return -! -! save nst-related prognostic fields for guess run -! - do i=1, im -! if(wet(i) .and. .not.icy(i) .and. flag_guess(i)) then - if(wet(i) .and. flag_guess(i) .and. use_lake_model(i)/=1) then - xt_old(i) = xt(i) - xs_old(i) = xs(i) - xu_old(i) = xu(i) - xv_old(i) = xv(i) - xz_old(i) = xz(i) - zm_old(i) = zm(i) - xtts_old(i) = xtts(i) - xzts_old(i) = xzts(i) - ifd_old(i) = ifd(i) - tskin_old(i) = tskin(i) - dt_cool_old(i) = dt_cool(i) - z_c_old(i) = z_c(i) - endif - enddo - - -! --- ... initialize variables. all units are m.k.s. unless specified. -! ps is in pascals, wind is wind speed, theta1 is surface air -! estimated from level 1 temperature, rho_a is air density and -! qss is saturation specific humidity at the water surface -!! - do i = 1, im - if ( flag(i) ) then - - nswsfc(i) = sfcnsw(i) ! net solar radiation at the air-sea surface (positive downward) - wndmag(i) = sqrt(u1(i)*u1(i) + v1(i)*v1(i)) - - q0(i) = max(q1(i), 1.0e-8_kp) - - if(thsfc_loc) then ! Use local potential temperature - theta1(i) = t1(i) * prslki(i) - else ! Use potential temperature referenced to 1000 hPa - theta1(i) = t1(i) / prslk1(i) ! potential temperature at the middle of lowest model layer - endif - - tv1(i) = t1(i) * (one + rvrdm1*q0(i)) - rho_a(i) = prsl1(i) / (rd*tv1(i)) - qss(i) = fpvs(tsurf(i)) ! pa - qss(i) = eps*qss(i) / (ps(i) + epsm1*qss(i)) ! pa -! - evap(i) = zero - hflx(i) = zero - gflux(i) = zero - ep(i) = zero - -! --- ... rcp = rho cp ch v - - rch(i) = rho_a(i) * cp * ch(i) * wind(i) - cmm(i) = cm (i) * wind(i) - chh(i) = rho_a(i) * ch(i) * wind(i) - -!> - Calculate latent and sensible heat flux over open water with tskin. -! at previous time step - evap(i) = elocp * rch(i) * (qss(i) - q0(i)) - qsurf(i) = qss(i) - - if(thsfc_loc) then ! Use local potential temperature - hflx(i) = rch(i) * (tsurf(i) - theta1(i)) - else ! Use potential temperature referenced to 1000 hPa - hflx(i) = rch(i) * (tsurf(i)/prsik1(i) - theta1(i)) - endif - -! if (lprnt .and. i == ipr) print *,' tskin=',tskin(i),' theta1=', -! & theta1(i),' hflx=',hflx(i),' t1=',t1(i),'prslki=',prslki(i) -! &,' tsurf=',tsurf(i) - endif - enddo - -! run nst model: dtm + slm -! - zsea1 = 0.001_kp*real(nstf_name4) - zsea2 = 0.001_kp*real(nstf_name5) - -!> - Call module_nst_water_prop::density() to compute sea water density. -!> - Call module_nst_water_prop::rhocoef() to compute thermal expansion -!! coefficient (\a alpha) and saline contraction coefficient (\a beta). - do i = 1, im - if ( flag(i) ) then - tsea = tsurf(i) - t12 = tsea*tsea - ulwflx(i) = sfcemis(i) * sbc * t12 * t12 - alon = xlon(i)*rad2deg - grav = grv(sinlat(i)) - soltim = mod(alon/15.0_kp + solhr, 24.0_kp)*3600.0_kp - call density(tsea,sss,rho_w) ! sea water density - call rhocoef(tsea,sss,rho_w,alpha,beta) ! alpha & beta -! -!> - Calculate sensible heat flux (\a qrain) due to rainfall. -! - le = (2.501_kp-0.00237_kp*tsea)*1e6_kp - dwat = 2.11e-5_kp*(t1(i)/t0k)**1.94_kp ! water vapor diffusivity - dtmp = (one+3.309e-3_kp*(t1(i)-t0k)-1.44e-6_kp*(t1(i)-t0k) - & * (t1(i)-t0k))*0.02411_kp/(rho_a(i)*cp) ! heat diffusivity - wetc = 622.0_kp*le*qss(i)/(rd*t1(i)*t1(i)) - alfac = one / (one + (wetc*le*dwat)/(cp*dtmp)) ! wet bulb factor - tem = (1.0e3_kp * rain(i) / rho_w) * alfac * cp_w - qrain(i) = tem * (tsea-t1(i)+1.0e3_kp*(qss(i)-q0(i))*le/cp) - -!> - Calculate input non solar heat flux as upward = positive to models here - - f_nsol = hflx(i) + evap(i) + ulwflx(i) - dlwflx(i) - & + omg_sh*qrain(i) - -! if (lprnt .and. i == ipr) print *,' f_nsol=',f_nsol,' hflx=', -! &hflx(i),' evap=',evap(i),' ulwflx=',ulwflx(i),' dlwflx=',dlwflx(i) -! &,' omg_sh=',omg_sh,' qrain=',qrain(i) - - sep = sss*(evap(i)/le-rain(i))/rho_w - ustar_a = sqrt(stress(i)/rho_a(i)) ! air friction velocity -! -! sensitivities of heat flux components to ts -! - rnl_ts = 4.0_kp*sfcemis(i)*sbc*tsea*tsea*tsea ! d(rnl)/d(ts) - hs_ts = rch(i) - hl_ts = rch(i)*elocp*eps*hvap*qss(i)/(rd*t12) - rf_ts = tem * (one+rch(i)*hl_ts) - q_ts = rnl_ts + hs_ts + hl_ts + omg_sh*rf_ts -! -!> - Call cool_skin(), which is the sub-layer cooling parameterization -!! (Fairfall et al. (1996) \cite fairall_et_al_1996). -! & calculate c_0, c_d -! - call cool_skin(ustar_a,f_nsol,nswsfc(i),evap(i),sss,alpha,beta - &, rho_w,rho_a(i),tsea,q_ts,hl_ts,grav,le - &, dt_cool(i),z_c(i),c_0(i),c_d(i)) - - tem = one / wndmag(i) - cosa = u1(i)*tem - sina = v1(i)*tem - taux = max(stress(i),tau_min)*cosa - tauy = max(stress(i),tau_min)*sina - fc = const_rot*sinlat(i) -! -! Run DTM-1p system. -! - if ( (soltim > solar_time_6am .and. ifd(i) == zero) ) then - else - ifd(i) = one -! -! calculate fcl thickness with current forcing and previous time's profile -! -! if (lprnt .and. i == ipr) print *,' beg xz=',xz(i) - -!> - Call convdepth() to calculate depth for convective adjustments. - if ( f_nsol > zero .and. xt(i) > zero ) then - call convdepth(kdt,timestep,nswsfc(i),f_nsol,sss,sep,rho_w - &, alpha,beta,xt(i),xs(i),xz(i),d_conv(i)) - else - d_conv(i) = zero - endif - -! if (lprnt .and. i == ipr) print *,' beg xz1=',xz(i) -! -! determine rich: wind speed dependent (right now) -! -! if ( wind(i) < 1.0 ) then -! rich = 0.25 + 0.03*wind(i) -! elseif ( wind(i) >= 1.0 .and. wind(i) < 1.5 ) then -! rich = 0.25 + 0.1*wind(i) -! elseif ( wind(i) >= 1.5 .and. wind(i) < 6.0 ) then -! rich = 0.25 + 0.6*wind(i) -! elseif ( wind(i) >= 6.0 ) then -! rich = 0.25 + min(0.8*wind(i),0.50) -! endif - - rich = ri_c - -!> - Call the diurnal thermocline layer model dtm_1p(). - call dtm_1p(kdt,timestep,rich,taux,tauy,nswsfc(i), - & f_nsol,sss,sep,q_ts,hl_ts,rho_w,alpha,beta,alon, - & sinlat(i),soltim,grav,le,d_conv(i), - & xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - -! if (lprnt .and. i == ipr) print *,' beg xz2=',xz(i) - -! apply mda - if ( xt(i) > zero ) then -!> - If \a dtl heat content \a xt > 0.0, call dtm_1p_mda() to apply -!! minimum depth adjustment (mda). - call dtm_1p_mda(xt(i),xtts(i),xz(i),xzts(i)) - if ( xz(i) >= z_w_max ) then -!> - If \a dtl thickness >= module_nst_parameters::z_w_max, call dtl_reset() -!! to reset xt/xs/x/xv to zero, and xz to module_nst_parameters::z_w_max. - call dtl_reset(xt(i),xs(i),xu(i),xv(i),xz(i),xtts(i), - & xzts(i)) - -! if (lprnt .and. i == ipr) print *,' beg xz3=',xz(i),' z_w_max=' -! &,z_w_max - endif - -! apply fca - if ( d_conv(i) > zero ) then -!> - If thickness of free convection layer > 0.0, call dtm_1p_fca() -!! to apply free convection adjustment. -!> - If \a dtl thickness >= module_nst_parameters::z_w_max(), call dtl_reset() -!! to reset xt/xs/x/xv to zero, and xz to module_nst_parameters::z_w_max(). - call dtm_1p_fca(d_conv(i),xt(i),xtts(i),xz(i),xzts(i)) - if ( xz(i) >= z_w_max ) then - call dtl_reset - & (xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - endif - endif - -! if (lprnt .and. i == ipr) print *,' beg xz4=',xz(i) - -! apply tla - dz = min(xz(i),max(d_conv(i),delz)) -! -!> - Call sw_ps_9b() to compute the fraction of the solar radiation -!! absorbed by the depth \a delz (Paulson and Simpson (1981) \cite paulson_and_simpson_1981). -!! And calculate the total heat absorbed in warm layer. - call sw_ps_9b(delz,fw) - q_warm = fw*nswsfc(i)-f_nsol !total heat absorbed in warm layer - -!> - Call cal_ttop() to calculate the diurnal warming amount at the top layer with -!! thickness of \a dz. - if ( q_warm > zero ) then - call cal_ttop(kdt,timestep,q_warm,rho_w,dz, - & xt(i),xz(i),ttop0) - -! if (lprnt .and. i == ipr) print *,' d_conv=',d_conv(i),' delz=', -! &delz,' kdt=',kdt,' timestep=',timestep,' nswsfc=',nswsfc(i), -! &' f_nsol=',f_nsol,' rho_w=',rho_w,' dz=',dz,' xt=',xt(i), -! &' xz=',xz(i),' qrain=',qrain(i) - - ttop = ((xt(i)+xt(i))/xz(i))*(one-dz/((xz(i)+xz(i)))) - -! if (lprnt .and. i == ipr) print *,' beg xz4a=',xz(i) -! &,' ttop=',ttop,' ttop0=',ttop0,' xt=',xt(i),' dz=',dz -! &,' xznew=',(xt(i)+sqrt(xt(i)*(xt(i)-dz*ttop0)))/ttop0 - -!> - Call dtm_1p_tla() to apply top layer adjustment. - if ( ttop > ttop0 ) then - call dtm_1p_tla(dz,ttop0,xt(i),xtts(i),xz(i),xzts(i)) - -! if (lprnt .and. i == ipr) print *,' beg xz4b=',xz(i),'z_w_max=', -! &z_w_max - if ( xz(i) >= z_w_max ) then - call dtl_reset - & (xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - endif - endif - endif ! if ( q_warm > 0.0 ) then - -! if (lprnt .and. i == ipr) print *,' beg xz5=',xz(i) - -! apply mwa -!> - Call dt_1p_mwa() to apply maximum warming adjustment. - t0 = (xt(i)+xt(i))/xz(i) - if ( t0 > tw_max ) then - call dtm_1p_mwa(xt(i),xtts(i),xz(i),xzts(i)) - if ( xz(i) >= z_w_max ) then - call dtl_reset - & (xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - endif - endif - -! if (lprnt .and. i == ipr) print *,' beg xz6=',xz(i) - -! apply mta -!> - Call dtm_1p_mta() to apply maximum temperature adjustment. - sstc = tref(i) + (xt(i)+xt(i))/xz(i) - dt_cool(i) - - if ( sstc > sst_max ) then - dta = sstc - sst_max - call dtm_1p_mta(dta,xt(i),xtts(i),xz(i),xzts(i)) -! write(*,'(a,f3.0,7f8.3)') 'mta, sstc,dta :',islimsk(i), -! & sstc,dta,tref(i),xt(i),xz(i),2.0*xt(i)/xz(i),dt_cool(i) - if ( xz(i) >= z_w_max ) then - call dtl_reset - & (xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - endif - endif -! - endif ! if ( xt(i) > 0.0 ) then -! reset dtl at midnight and when solar zenith angle > 89.994 degree - if ( abs(soltim) < 2.0_kp*timestep ) then - call dtl_reset - & (xt(i),xs(i),xu(i),xv(i),xz(i),xzts(i),xtts(i)) - endif - - endif ! if (solar_time > solar_time_6am .and. ifd(i) == 0.0 ) then: too late to start the first day - -! if (lprnt .and. i == ipr) print *,' beg xz7=',xz(i) - -! update tsurf (when flag(i) .eqv. .true. ) -!> - Call get_dtzm_point() to computes \a dtz and \a tsurf. - call get_dtzm_point(xt(i),xz(i),dt_cool(i),z_c(i), - & zsea1,zsea2,dtz) - tsurf(i) = max(tgice, tref(i) + dtz ) - -! if (lprnt .and. i == ipr) print *,' tsurf=',tsurf(i),' tref=', -! &tref(i),' xz=',xz(i),' dt_cool=',dt_cool(i) - -!> - Call cal_w() to calculate \a w_0 and \a w_d. - if ( xt(i) > zero ) then - call cal_w(kdt,xz(i),xt(i),xzts(i),xtts(i),w_0(i),w_d(i)) - else - w_0(i) = zero - w_d(i) = zero - endif - -! if ( xt(i) > 0.0 ) then -! rig(i) = grav*xz(i)*xz(i)*(alpha*xt(i)-beta*xs(i)) -! & /(2.0*(xu(i)*xu(i)+xv(i)*xv(i))) -! else -! rig(i) = 0.25 -! endif - -! qrain(i) = rig(i) - zm(i) = wind(i) - - endif - enddo - -! restore nst-related prognostic fields for guess run - do i=1, im -! if (wet(i) .and. .not.icy(i)) then - if (wet(i) .and. use_lake_model(i)/=1) then - if (flag_guess(i)) then ! when it is guess of - xt(i) = xt_old(i) - xs(i) = xs_old(i) - xu(i) = xu_old(i) - xv(i) = xv_old(i) - xz(i) = xz_old(i) - zm(i) = zm_old(i) - xtts(i) = xtts_old(i) - xzts(i) = xzts_old(i) - ifd(i) = ifd_old(i) - tskin(i) = tskin_old(i) - dt_cool(i) = dt_cool_old(i) - z_c(i) = z_c_old(i) - else -! -! update tskin when coupled and not guess run -! (all other NSST variables have been updated in this case) -! - if ( nstf_name1 > 1 ) then - tskin(i) = tsurf(i) - endif ! if nstf_name1 > 1 then - endif ! if flag_guess(i) then - endif ! if wet(i) .and. .not.icy(i) then - enddo - -! if (lprnt .and. i == ipr) print *,' beg xz8=',xz(i) - - if ( nstf_name1 > 1 ) then -!> - Calculate latent and sensible heat flux over open water with updated tskin -!! for the grids of open water and the iteration is on. - do i = 1, im - if ( flag(i) ) then - qss(i) = fpvs( tskin(i) ) - qss(i) = eps*qss(i) / (ps(i) + epsm1*qss(i)) - qsurf(i) = qss(i) - evap(i) = elocp*rch(i) * (qss(i) - q0(i)) - - if(thsfc_loc) then ! Use local potential temperature - hflx(i) = rch(i) * (tskin(i) - theta1(i)) - else ! Use potential temperature referenced to 1000 hPa - hflx(i) = rch(i) * (tskin(i)/prsik1(i) - theta1(i)) - endif - - endif - enddo - endif ! if ( nstf_name1 > 1 ) then -! -!> - Include sea spray effects -! - do i=1,im - if(lseaspray .and. flag(i)) then - f10m = fm10(i) / fm(i) - u10m = f10m * u1(i) - v10m = f10m * v1(i) - ws10 = sqrt(u10m*u10m + v10m*v10m) - ws10 = max(ws10,1.) - ws10 = min(ws10,ws10cr) - tem = .015 * ws10 * ws10 - ru10 = 1. - .087 * log(10./tem) - qss1 = fpvs(t1(i)) - qss1 = eps * qss1 / (prsl1(i) + epsm1 * qss1) - tem = rd * cp * t1(i) * t1(i) - tem = 1. + eps * hvap * hvap * qss1 / tem - bb1 = 1. / tem - evaps = conlf * (ws10**5.4) * ru10 * bb1 - evaps = evaps * rho_a(i) * hvap * (qss1 - q0(i)) - evap(i) = evap(i) + alps * evaps - hflxs = consf * (ws10**3.4) * ru10 - hflxs = hflxs * rho_a(i) * cp * (tskin(i) - t1(i)) - ptem = alps - gams - hflx(i) = hflx(i) + bets * hflxs - ptem * evaps - endif - enddo -! - do i=1,im - if ( flag(i) ) then - tem = one / rho_a(i) - hflx(i) = hflx(i) * tem * cpinv - evap(i) = evap(i) * tem * hvapi - endif - enddo -! -! if (lprnt) print *,' tskin=',tskin(ipr) - - return - end subroutine sfc_nst_run -!> @} - end module sfc_nst diff --git a/physics/sfc_nst.f90 b/physics/SFC_Layer/UFS/sfc_nst.f90 similarity index 100% rename from physics/sfc_nst.f90 rename to physics/SFC_Layer/UFS/sfc_nst.f90 diff --git a/physics/SFC_Layer/UFS/sfc_nst_post.f b/physics/SFC_Layer/UFS/sfc_nst_post.f deleted file mode 100644 index 83bc2f273..000000000 --- a/physics/SFC_Layer/UFS/sfc_nst_post.f +++ /dev/null @@ -1,93 +0,0 @@ -!> \file sfc_nst_post.f -!! This file contains code to be executed after the GFS NSST model. - - module sfc_nst_post - - contains - -! \defgroup GFS_NSST_POST GFS Near-Surface Sea Temperature Post - -!> \section arg_table_sfc_nst_post_run Argument Table -!! \htmlinclude sfc_nst_post_run.html -!! -! \section NSST_general_post_algorithm General Algorithm -! -! \section NSST_detailed_post_algorithm Detailed Algorithm -! @{ - subroutine sfc_nst_post_run & - & ( im, kdt, rlapse, tgice, wet, use_lake_model, icy, oro, & - & oro_uf, nstf_name1, & - & nstf_name4, nstf_name5, xt, xz, dt_cool, z_c, tref, xlon, & - & tsurf_wat, tsfc_wat, nthreads, dtzm, errmsg, errflg & - & ) - - use machine , only : kind_phys - use module_nst_water_prop, only: get_dtzm_2d - - implicit none - - integer, parameter :: kp = kind_phys - -! --- inputs: - integer, intent(in) :: im, kdt, nthreads - logical, dimension(:), intent(in) :: wet, icy - integer, dimension(:), intent(in) :: use_lake_model - real (kind=kind_phys), intent(in) :: rlapse, tgice - real (kind=kind_phys), dimension(:), intent(in) :: oro, oro_uf - integer, intent(in) :: nstf_name1, nstf_name4, nstf_name5 - real (kind=kind_phys), dimension(:), intent(in) :: xt, xz, & - & dt_cool, z_c, tref, xlon - -! --- input/outputs: - real (kind=kind_phys), dimension(:), intent(inout) :: tsurf_wat, & - & tsfc_wat - -! --- outputs: - real (kind=kind_phys), dimension(:), intent(out) :: dtzm - - character(len=*), intent(out) :: errmsg - integer, intent(out) :: errflg - -! --- locals - integer :: i - real(kind=kind_phys) :: zsea1, zsea2 - - ! Initialize CCPP error handling variables - errmsg = '' - errflg = 0 - -! if (lprnt) print *,' tseaz2=',tseal(ipr),' tref=',tref(ipr), -! & ' dt_cool=',dt_cool(ipr),' dt_warm=',2.0*xt(ipr)/xz(ipr), -! & ' kdt=',kdt - -! do i = 1, im -! if (wet(i) .and. .not. icy(i)) then -! tsurf_wat(i) = tsurf_wat(i) - (oro(i)-oro_uf(i)) * rlapse -! endif -! enddo - -! --- ... run nsst model ... --- - - if (nstf_name1 > 1) then - zsea1 = 0.001_kp*real(nstf_name4) - zsea2 = 0.001_kp*real(nstf_name5) - call get_dtzm_2d (xt, xz, dt_cool, z_c, wet, zsea1, zsea2, & - & im, 1, nthreads, dtzm) - do i = 1, im -! if (wet(i) .and. .not.icy(i)) then -! if (wet(i) .and. (frac_grid .or. .not. icy(i))) then - if (wet(i) .and. use_lake_model(i) /=1) then - tsfc_wat(i) = max(tgice, tref(i) + dtzm(i)) -! tsfc_wat(i) = max(271.2, tref(i) + dtzm(i)) - & -! (oro(i)-oro_uf(i))*rlapse - endif - enddo - endif - -! if (lprnt) print *,' tseaz2=',tsea(ipr),' tref=',tref(ipr), & -! & ' dt_cool=',dt_cool(ipr),' dt_warm=',dt_warm(ipr),' kdt=',kdt - - return - end subroutine sfc_nst_post_run - - end module sfc_nst_post diff --git a/physics/sfc_nst_post.f90 b/physics/SFC_Layer/UFS/sfc_nst_post.f90 similarity index 100% rename from physics/sfc_nst_post.f90 rename to physics/SFC_Layer/UFS/sfc_nst_post.f90 diff --git a/physics/SFC_Layer/UFS/sfc_nst_pre.f b/physics/SFC_Layer/UFS/sfc_nst_pre.f deleted file mode 100644 index 77ff61f00..000000000 --- a/physics/SFC_Layer/UFS/sfc_nst_pre.f +++ /dev/null @@ -1,96 +0,0 @@ -!> \file sfc_nst_pre.f -!! This file contains preparation for the GFS NSST model. - - module sfc_nst_pre - - contains - -!> \defgroup GFS_NSST_PRE GFS Near-Surface Sea Temperature Pre -!! -!! The NSST scheme is one of the three schemes used to represent the -!! surface in the GFS physics suite. The other two are the Noah land -!! surface model and the sice simplified ice model. -!! -!! \section arg_table_sfc_nst_pre_run Argument Table -!! \htmlinclude sfc_nst_pre_run.html -!! -!> \section NSST_general_pre_algorithm General Algorithm - subroutine sfc_nst_pre_run - & (im, wet, tgice, tsfco, tsurf_wat, - & tseal, xt, xz, dt_cool, z_c, tref, cplflx, - & oceanfrac, nthreads, errmsg, errflg) - - use machine , only : kind_phys - use module_nst_water_prop, only: get_dtzm_2d - - implicit none - - integer, parameter :: kp = kind_phys - -! --- inputs: - integer, intent(in) :: im, nthreads - logical, dimension(:), intent(in) :: wet - real (kind=kind_phys), intent(in) :: tgice - real (kind=kind_phys), dimension(:), intent(in) :: - & tsfco, xt, xz, dt_cool, z_c, oceanfrac - logical, intent(in) :: cplflx - -! --- input/outputs: - real (kind=kind_phys), dimension(:), intent(inout) :: - & tsurf_wat, tseal, tref - -! --- outputs: - character(len=*), intent(out) :: errmsg - integer, intent(out) :: errflg - -! --- locals - integer :: i - real(kind=kind_phys), parameter :: zero = 0.0_kp, - & one = 1.0_kp, - & half = 0.5_kp, - & omz1 = 2.0_kp - real(kind=kind_phys) :: tem1, tem2, dnsst - real(kind=kind_phys), dimension(im) :: dtzm, z_c_0 - - ! Initialize CCPP error handling variables - errmsg = '' - errflg = 0 - - do i=1,im - if (wet(i) .and. oceanfrac(i) > 0.0) then -! tem = (oro(i)-oro_uf(i)) * rlapse - ! DH* 20190927 simplyfing this code because tem is zero - !tem = zero - !tseal(i) = tsfco(i) + tem - tseal(i) = tsfco(i) - !tsurf_wat(i) = tsurf_wat(i) + tem - ! *DH - endif - enddo -! -! update tsfc & tref with T1 from OGCM & NSST Profile if coupled -! - if (cplflx) then - z_c_0 = zero - call get_dtzm_2d (xt, xz, dt_cool, & - & z_c_0, wet, zero, omz1, im, 1, nthreads, dtzm) - do i=1,im - if (wet(i) .and. oceanfrac(i) > zero ) then -! dnsst = tsfc_wat(i) - tref(i) ! retrive/get difference of Ts and Tf - tref(i) = max(tgice, tsfco(i) - dtzm(i)) ! update Tf with T1 and NSST T-Profile -! tsfc_wat(i) = max(271.2,tref(i) + dnsst) ! get Ts updated due to Tf update -! tseal(i) = tsfc_wat(i) - if (abs(xz(i)) > zero) then - tem2 = one / xz(i) - else - tem2 = zero - endif - tseal(i) = tref(i) + (xt(i)+xt(i)) * tem2 - dt_cool(i) - tsurf_wat(i) = tseal(i) - endif - enddo - endif - - return - end subroutine sfc_nst_pre_run - end module sfc_nst_pre diff --git a/physics/sfc_nst_pre.f90 b/physics/SFC_Layer/UFS/sfc_nst_pre.f90 similarity index 100% rename from physics/sfc_nst_pre.f90 rename to physics/SFC_Layer/UFS/sfc_nst_pre.f90 From 3c1e819f5f1042917fcc68810254362252621315 Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 7 Dec 2023 18:18:07 +0000 Subject: [PATCH 10/11] More metadata fixes --- physics/MP/GFDL/fv_sat_adj.meta | 4 +++- physics/SFC_Models/Land/Noah/lsm_noah.meta | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/physics/MP/GFDL/fv_sat_adj.meta b/physics/MP/GFDL/fv_sat_adj.meta index 8c3c9be42..c91e438b7 100644 --- a/physics/MP/GFDL/fv_sat_adj.meta +++ b/physics/MP/GFDL/fv_sat_adj.meta @@ -1,7 +1,9 @@ [ccpp-table-properties] name = fv_sat_adj type = scheme - dependencies = ../../hooks/machine.F,../../hooks/physcons.F90,module_gfdl_cloud_microphys.F90,multi_gases.F90 + dependencies = ../../hooks/machine.F,../../hooks/physcons.F90 + dependencies = module_gfdl_cloud_microphys.F90,multi_gases.F90 + dependencies = ../module_mp_radar.F90 ######################################################################## [ccpp-arg-table] diff --git a/physics/SFC_Models/Land/Noah/lsm_noah.meta b/physics/SFC_Models/Land/Noah/lsm_noah.meta index 44cb6aa5b..f3ce1d19b 100644 --- a/physics/SFC_Models/Land/Noah/lsm_noah.meta +++ b/physics/SFC_Models/Land/Noah/lsm_noah.meta @@ -2,7 +2,7 @@ name = lsm_noah type = scheme dependencies = ../../../tools/funcphys.f90,../../../hooks/machine.F - dependencies = set_soilveg.f,sflx.f,surface_perturbation.F90 + dependencies = set_soilveg.f,sflx.f,surface_perturbation.F90,namelist_soilveg.f ######################################################################## [ccpp-arg-table] From a7b8325bdf3f0a16f7354854276f40918b32549b Mon Sep 17 00:00:00 2001 From: Dustin Swales Date: Thu, 14 Dec 2023 00:46:00 +0000 Subject: [PATCH 11/11] Bug in CMake file --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bac0637a4..ee708d4c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -108,8 +108,8 @@ set(SCHEMES_OPENMP_OFF ${LOCAL_CURRENT_SOURCE_DIR}/physics/Radiation/RRTMGP/rte- # List of files that need to be compiled with different precision set(SCHEMES_DYNAMICS) -if(${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90fv_sat_adj.F90 IN_LIST SCHEMES) - list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90/fv_sat_adj.F90) +if(${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90 IN_LIST SCHEMES) + list(APPEND SCHEMES_DYNAMICS ${LOCAL_CURRENT_SOURCE_DIR}/physics/MP/GFDL/fv_sat_adj.F90) endif() # Remove files that need to be compiled with different precision