More cleanup

ufs-community · Oct 26, 2023 · f7edbc1 · f7edbc1
1 parent e627b18
commit f7edbc1
Show file tree

Hide file tree

Showing 42 changed files with 38 additions and 326 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/physics/NOTUSED/gocart_tracer_config_stub.f b/physics/NOTUSED/gocart_tracer_config_stub.f
diff --git a/physics/NOTUSED/rrtmg_lw_pre.F90 b/physics/NOTUSED/rrtmg_lw_pre.F90
diff --git a/physics/NOTUSED/rrtmg_lw_pre.meta b/physics/NOTUSED/rrtmg_lw_pre.meta
diff --git 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
@@ -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]