Cleanup from previous sync

dustinswales · dustinswales · commit 3b854b109e8e · 2025-03-05T11:05:03.000-07:00
diff --git a/physics/CONV/SAMF/samfdeepcnv.meta b/physics/CONV/SAMF/samfdeepcnv.meta
@@ -437,70 +437,6 @@
   type = real
   kind = kind_phys
   intent = inout
-[sigmain]
-  standard_name = prognostic_updraft_area_fraction_in_convection
-  long_name = convective updraft area fraction
-  units = frac
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = True
-[sigmaout]
-  standard_name = updraft_area_fraction_updated_by_physics
-  long_name = convective updraft area fraction updated by physics
-  units = frac
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
-  intent = out
-  optional = True
-[betascu]
-  standard_name = tuning_param_for_shallow_cu
-  long_name = tuning param for shallow cu in case prognostic closure is used
-  units = none
-  dimensions = ()
-  type = real
-  kind = kind_phys
-  intent = in
-[betamcu]
-  standard_name = tuning_param_for_midlevel_cu
-  long_name = tuning param for midlevel cu in case prognostic closure is used
-  units = none
-  dimensions = ()
-  type = real
-  kind = kind_phys
-  intent = in
-[betadcu]
-  standard_name = tuning_param_for_deep_cu
-  long_name = tuning param for deep cu in case prognostic closure is used
-  units = none
-  dimensions = ()
-  type = real
-  intent = in
-[maxMF]
-  standard_name = maximum_mass_flux
-  long_name = maximum mass flux within a column
-  units = m s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = True
-[do_mynnedmf]
-  standard_name = flag_for_mellor_yamada_nakanishi_niino_pbl_scheme
-  long_name = flag to activate MYNN-EDMF
-  units = flag 
-  dimensions = ()
-  type = logical
-  intent = in
-[sigmab_coldstart]
-  standard_name = flag_to_cold_start_for_sigmab_init
-  long_name = flag to cold start for sigmab initialization
-  units = flag
-  dimensions = ()
-  type = logical 
-  intent = in
 [qlcn]
   standard_name = mass_fraction_of_convective_cloud_liquid_water
   long_name = mass fraction of convective cloud liquid water
@@ -779,6 +715,13 @@
   dimensions = ()
   type = logical
   intent = in
+[sigmab_coldstart]
+  standard_name = flag_to_cold_start_for_sigmab_init
+  long_name = flag to cold start for sigmab initialization
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
diff --git a/physics/GWD/cires_ugwp.F90 b/physics/GWD/cires_ugwp.F90
@@ -229,7 +229,7 @@ subroutine cires_ugwp_run(do_ugwp, me,  master, im,  levs, ntrac, dtp, kdt, lonr
     real(kind=kind_phys),    intent(out), dimension(:)      :: tau_mtb, tau_ogw, tau_tofd, tau_ngw
     real(kind=kind_phys),    intent(out), dimension(:, :):: gw_dudt, gw_dvdt, gw_dtdt, gw_kdis
     real(kind=kind_phys),    intent(out), dimension(:, :):: dudt_mtb, dudt_tms
-    real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dudt_ogw
+    real(kind=kind_phys),    intent(out), dimension(:, :):: dudt_ogw
     real(kind=kind_phys),    intent(out), dimension(:), optional :: dusfc_ms, dvsfc_ms, dusfc_bl, dvsfc_bl
     real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dtauy2d_ms
     real(kind=kind_phys),    intent(out), dimension(:, :), optional :: dtaux2d_bl, dtauy2d_bl
diff --git a/physics/GWD/cires_ugwp.meta b/physics/GWD/cires_ugwp.meta
@@ -640,7 +640,6 @@
   type = real
   kind = kind_phys
   intent = out
-  optional = True
 [dtauy2d_ms]
   standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag
   long_name = instantaneous change in y wind due to orographic gw drag
diff --git a/physics/GWD/cires_ugwp_post.F90 b/physics/GWD/cires_ugwp_post.F90
@@ -35,7 +35,7 @@ subroutine cires_ugwp_post_run (ldiag_ugwp, dtf, im, levs,     &
         real(kind=kind_phys), intent(inout), dimension(:)   :: tot_mtb, tot_ogw, tot_tofd, tot_ngw
         real(kind=kind_phys), intent(inout), dimension(:)   :: tot_zmtb, tot_zlwb, tot_zogw
         real(kind=kind_phys), intent(in),    dimension(:,:) :: gw_dtdt, gw_dudt, gw_dvdt, dudt_mtb, dudt_tms
-        real(kind=kind_phys), intent(in),    dimension(:,:), optional :: dudt_ogw
+        real(kind=kind_phys), intent(in),    dimension(:,:) :: dudt_ogw
         real(kind=kind_phys), intent(inout), dimension(:,:), optional :: du3dt_mtb, du3dt_ogw, du3dt_tms, du3dt_ngw, dv3dt_ngw
         real(kind=kind_phys), intent(inout), dimension(:,:) :: dtdt, dudt, dvdt
 
diff --git a/physics/GWD/cires_ugwp_post.meta b/physics/GWD/cires_ugwp_post.meta
@@ -132,7 +132,6 @@
   type = real
   kind = kind_phys
   intent = in
-  optional = True
 [dudt_tms]
   standard_name = tendency_of_x_wind_due_to_turbulent_orographic_form_drag
   long_name = instantaneous change in x wind due to TOFD
diff --git a/physics/GWD/drag_suite.F90 b/physics/GWD/drag_suite.F90
@@ -383,9 +383,10 @@ subroutine drag_suite_run(                                           &
      &                      dusfc_ms(:),dvsfc_ms(:),             &
      &                      dusfc_bl(:),dvsfc_bl(:),             &
      &                      dusfc_ss(:),dvsfc_ss(:),             &
-     &                      dusfc_fd(:),dvsfc_fd(:)
+     &                      dusfc_fd(:),dvsfc_fd(:),             &
+     &                      dtaux2d_ms(:,:)
    real(kind=kind_phys), intent(inout), optional ::              &
-     &         dtaux2d_ms(:,:),dtauy2d_ms(:,:),                  &
+     &         dtauy2d_ms(:,:),                                  &
      &         dtaux2d_bl(:,:),dtauy2d_bl(:,:),                  &
      &         dtaux2d_ss(:,:),dtauy2d_ss(:,:),                  &
      &         dtaux2d_fd(:,:),dtauy2d_fd(:,:)
diff --git a/physics/GWD/drag_suite.meta b/physics/GWD/drag_suite.meta
@@ -282,7 +282,6 @@
   type = real
   kind = kind_phys
   intent = inout
-  optional = True
 [dtauy2d_ms]
   standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag
   long_name = y wind tendency from mesoscale gwd
diff --git a/physics/GWD/ugwpv1_gsldrag.F90 b/physics/GWD/ugwpv1_gsldrag.F90
@@ -419,11 +419,11 @@ subroutine ugwpv1_gsldrag_run(me, master, im, levs, ak, bk, ntrac, lonr, dtp,
     real(kind=kind_phys), intent(out), dimension(:)  :: tau_ogw, tau_ngw, tau_oss
 
     real(kind=kind_phys), intent(out) , dimension(:,:), optional ::         &
-                          dudt_ogw, dvdt_ogw, dudt_obl, dvdt_obl, &
+                          dvdt_ogw, dudt_obl, dvdt_obl, &
                           dudt_oss, dvdt_oss, dudt_ofd, dvdt_ofd
 
     real(kind=kind_phys), intent(out) , dimension(:,:), optional :: dudt_ngw, dvdt_ngw, kdis_ngw, dtdt_ngw
-    real(kind=kind_phys), intent(out) , dimension(:,:) :: dudt_gw,  dvdt_gw, dtdt_gw, kdis_gw
+    real(kind=kind_phys), intent(out) , dimension(:,:) :: dudt_gw,  dvdt_gw, dtdt_gw, kdis_gw, dudt_ogw
 
     real(kind=kind_phys), intent(out) , dimension(:)   :: zogw, zlwb, zobl, zngw
 !
diff --git a/physics/GWD/ugwpv1_gsldrag.meta b/physics/GWD/ugwpv1_gsldrag.meta
@@ -786,7 +786,6 @@
   type = real
   kind = kind_phys
   intent = out
-  optional = True
 [dvdt_ogw]
   standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag
   long_name = y wind tendency from meso scale ogw
diff --git a/physics/GWD/ugwpv1_gsldrag_post.F90 b/physics/GWD/ugwpv1_gsldrag_post.F90
@@ -40,8 +40,8 @@ subroutine ugwpv1_gsldrag_post_run ( im, levs, ldiag_ugwp,       &
         real(kind=kind_phys), intent(inout), dimension(:)   :: tot_mtb, tot_ogw, tot_tofd, tot_ngw
         real(kind=kind_phys), intent(inout), dimension(:)   :: tot_zmtb, tot_zlwb, tot_zogw
 	
-        real(kind=kind_phys), intent(in),    dimension(:,:) :: dtdt_gw, dudt_gw, dvdt_gw
-        real(kind=kind_phys), intent(in),    dimension(:,:), optional :: dudt_obl, dvdt_obl, dudt_ogw
+        real(kind=kind_phys), intent(in),    dimension(:,:) :: dtdt_gw, dudt_gw, dvdt_gw, dudt_ogw
+        real(kind=kind_phys), intent(in),    dimension(:,:), optional :: dudt_obl, dvdt_obl
         real(kind=kind_phys), intent(in),    dimension(:,:), optional :: dvdt_ogw, dudt_ofd, dvdt_ofd
         real(kind=kind_phys), intent(in),    dimension(:,:), optional :: dudt_oss, dvdt_oss
         real(kind=kind_phys), intent(inout), dimension(:,:), optional :: du3dt_mtb, du3dt_ogw, du3dt_tms
diff --git a/physics/GWD/ugwpv1_gsldrag_post.meta b/physics/GWD/ugwpv1_gsldrag_post.meta
@@ -144,7 +144,6 @@
   type = real
   kind = kind_phys
   intent = in
-  optional = True
 [dvdt_ogw]
   standard_name = tendency_of_y_wind_due_to_mesoscale_orographic_gravity_wave_drag
   long_name = y wind tendency from meso scale ogw
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
@@ -1483,28 +1483,6 @@
   kind = kind_phys
   intent = out
   optional = True
-[top_at_1]
-  standard_name = flag_for_vertical_ordering_in_radiation
-  long_name = flag for vertical ordering in radiation
-  units = flag
-  dimensions = ()
-  type = logical
-  intent = in
-[si]
-  standard_name = sigma_pressure_hybrid_vertical_coordinate
-  long_name = vertical sigma coordinate for radiation initialization
-  units = none
-  dimensions = (vertical_interface_dimension)
-  type = real
-  kind = kind_phys
-  intent = in
-[ico2]
-  standard_name = control_for_co2
-  long_name = prescribed global mean value (old opernl)
-  units = flag
-  dimensions = ()
-  type = integer
-  intent = in
 [rrfs_sd]
   standard_name = do_smoke_coupling
   long_name = flag controlling rrfs_sd collection (default off)
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.F90
@@ -45,7 +45,7 @@ subroutine GFS_surface_composites_pre_run (im, lkm, frac_grid, iopt_lake, iopt_l
       real(kind=kind_phys), dimension(:), intent(in   )  :: snowd, tprcp, uustar, weasd, qss, tisfc
 
       real(kind=kind_phys), dimension(:), intent(inout)  :: tsfc, tsfco, tsfcl
-      real(kind=kind_phys), dimension(:), intent(inout)  :: tgrs1
+      real(kind=kind_phys), dimension(:), intent(in)     :: tgrs1
       real(kind=kind_phys), dimension(:), intent(inout)  :: snowd_lnd, snowd_ice, tprcp_wat,            &
                     tprcp_lnd, tprcp_ice, tsfc_wat, tsurf_wat,tsurf_lnd, tsurf_ice,                     &
                     uustar_wat, uustar_lnd, uustar_ice, weasd_lnd, weasd_ice,                           &
diff --git a/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta b/physics/SFC_Models/Land/Noahmp/lnd_iau_mod.meta
@@ -33,7 +33,7 @@
 [ccpp-table-properties]
   name = land_iau_mod
   type = module
-  dependencies = machine.F
+  dependencies = ../../../hooks/machine.F
 
 [ccpp-arg-table]
   name = land_iau_mod
diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta
@@ -841,72 +841,6 @@
   kind = kind_phys
   intent = inout
   optional = True
-[mpicomm]
-  standard_name = mpi_communicator
-  long_name = MPI communicator
-  units = index
-  dimensions = ()
-  type = MPI_Comm
-  intent = in
-[mpirank]
-  standard_name = mpi_rank
-  long_name = current MPI-rank
-  units = index
-  dimensions = ()
-  type = integer
-  intent = in
-[mpiroot]
-  standard_name = mpi_root
-  long_name = master MPI-rank
-  units = index
-  dimensions = ()
-  type = integer
-  intent = in
-[rho_dry]
-  standard_name = dry_air_density
-  long_name = dry air density
-  units = kg m-3
-  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = True
-[uspdavg]
-  standard_name = mean_wind_speed_in_boundary_layer
-  long_name = average wind speed within the boundary layer
-  units = m s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = True
-[hpbl_thetav]
-  standard_name = atmosphere_boundary_layer_thickness_from_modified_parcel
-  long_name = pbl height based on modified parcel method
-  units = m
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = True
-[drydep_flux_out]
-  standard_name = dry_deposition_flux
-  long_name = rrfs dry deposition flux
-  units = ug m-2
-  dimensions = (horizontal_loop_extent,number_of_chemical_species_deposited)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = True
-[wetdpr]
-  standard_name = mp_wet_deposition_smoke_dust
-  long_name = large scale wet deposition of smoke and dust
-  units = kg kg-1
-  dimensions = (horizontal_loop_extent,number_of_chemical_species_vertically_mixed)
-  type = real
-  kind = kind_phys
-  intent = inout
-  optional = True
 [hwp]
   standard_name = hourly_wildfire_potential
   long_name = rrfs hourly fire weather potential
@@ -950,6 +884,22 @@
   kind = kind_phys
   intent = inout
   optional = True
+[smoke_fire]
+  standard_name = smoke_emission_of_fire
+  long_name = smoke emission of fire
+  units = kg m-2
+  dimensions = (horizontal_loop_extent)
+  type = real
+  kind = kind_phys
+  intent = in
+  optional = True
+[cpl_fire]
+  standard_name = do_fire_coupling
+  long_name = flag controlling fire_behavior collection (default off)
+  units = flag
+  dimensions = ()
+  type = logical
+  intent = in
 [peak_hr_out]
   standard_name = peak_hr_fire
   long_name = time_of_peak_fire_emissions
@@ -1003,6 +953,14 @@
   type = real
   kind = kind_phys
   intent = in
+[totprcp]
+  standard_name = accumulated_lwe_thickness_of_precipitation_amount
+  long_name = accumulated total precipitation
+  units = m
+  dimensions = (horizontal_loop_extent)
+  type = real
+  kind = kind_phys
+  intent = in
 [uspdavg]
   standard_name = mean_wind_speed_in_boundary_layer
   long_name = average wind speed within the boundary layer
@@ -1021,6 +979,15 @@
   kind = kind_phys
   intent = inout
   optional = True
+[rho_dry]
+  standard_name = dry_air_density
+  long_name = dry air density
+  units = kg m-3
+  dimensions = (horizontal_loop_extent,vertical_layer_dimension)
+  type = real
+  kind = kind_phys
+  intent = inout
+  optional = True
 [mpicomm]
   standard_name = mpi_communicator
   long_name = MPI communicator
@@ -1042,30 +1009,6 @@
   dimensions = ()
   type = integer
   intent = in
-[smoke_fire]
-  standard_name = smoke_emission_of_fire
-  long_name = smoke emission of fire
-  units = kg m-2
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-  optional = True
-[totprcp]
-  standard_name = accumulated_lwe_thickness_of_precipitation_amount
-  long_name = accumulated total precipitation
-  units = m
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  intent = in
-[cpl_fire]
-  standard_name = do_fire_coupling
-  long_name = flag controlling fire_behavior collection (default off)
-  units = flag
-  dimensions = ()
-  type = logical
-  intent = in
 [errmsg]
   standard_name = ccpp_error_message
   long_name = error message for error handling in CCPP
