Merge branch 'main' into ufs-dev-pr365

grantfirl · grantfirl · commit 8a6f8606fe91 · 2026-06-17T15:43:07.000-04:00
diff --git a/physics/CONV/C3/cu_c3_driver.meta b/physics/CONV/C3/cu_c3_driver.meta
@@ -288,6 +288,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [phil]
   standard_name = geopotential
diff --git a/physics/CONV/Grell_Freitas/cu_gf_driver.meta b/physics/CONV/Grell_Freitas/cu_gf_driver.meta
@@ -579,7 +579,6 @@
   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
diff --git a/physics/CONV/SAMF/samfdeepcnv.meta b/physics/CONV/SAMF/samfdeepcnv.meta
@@ -564,6 +564,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [maxMF]
   standard_name = maximum_mass_flux
diff --git a/physics/CONV/SAMF/samfshalcnv.meta b/physics/CONV/SAMF/samfshalcnv.meta
@@ -596,6 +596,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [cat_adj_shal]
   standard_name = adjustment_for_convective_advection_time_for_shallow
diff --git a/physics/GWD/rayleigh_damp.f b/physics/GWD/rayleigh_damp.f
@@ -135,13 +135,13 @@ subroutine rayleigh_damp_run (                                    &
           B(I,K)  = DTAUX * dti
           C(I,K)  = max((ENG0-ENG1),0.0) * hfbcpdt
           IF(vidx>=1) THEN
-            dtend(i,k,vidx) = dtend(i,k,vidx) + A*dt
+            dtend(i,k,vidx) = dtend(i,k,vidx) + A(i,k)*dt
           ENDIF
           IF(uidx>=1) THEN
-            dtend(i,k,uidx) = dtend(i,k,uidx) + B*dt
+            dtend(i,k,uidx) = dtend(i,k,uidx) + B(i,k)*dt
           ENDIF
           IF(tidx>=1) THEN
-            dtend(i,k,tidx) = dtend(i,k,tidx) + C*dt
+            dtend(i,k,tidx) = dtend(i,k,tidx) + C(i,k)*dt
           ENDIF
         ENDDO
       ENDDO
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rad_time_vary.scm.F90
@@ -29,19 +29,19 @@ subroutine GFS_rad_time_vary_timestep_init (lrseeds, rseeds,
 
          ! Interface variables
          logical,                intent(in)    :: lrseeds
-         integer,                intent(in)    :: rseeds(:,:)
+         integer,                intent(in),    optional :: rseeds(:,:)
          integer,                intent(in)    :: isubc_lw, isubc_sw, cnx, cny, isc, jsc, kdt
          integer,                intent(in)    :: imp_physics, ipsd0, ipsdlim
          logical,                intent(in)    :: lslwr, lsswr
-         integer,                intent(inout) :: icsdsw(:), icsdlw(:)
+         integer,                intent(inout), optional :: icsdsw(:), icsdlw(:)
          integer,                intent(in)    :: imap(:), jmap(:)
          real(kind_phys),        intent(in)    :: sec
-         real(kind_phys),        intent(inout) :: ps_2delt(:)
-         real(kind_phys),        intent(inout) :: ps_1delt(:)
-         real(kind_phys),        intent(inout) :: t_2delt(:,:)
-         real(kind_phys),        intent(inout) :: t_1delt(:,:)
-         real(kind_phys),        intent(inout) :: qv_2delt(:,:)
-         real(kind_phys),        intent(inout) :: qv_1delt(:,:)
+         real(kind_phys),        intent(inout), optional :: ps_2delt(:)
+         real(kind_phys),        intent(inout), optional :: ps_1delt(:)
+         real(kind_phys),        intent(inout), optional :: t_2delt(:,:)
+         real(kind_phys),        intent(inout), optional :: t_1delt(:,:)
+         real(kind_phys),        intent(inout), optional :: qv_2delt(:,:)
+         real(kind_phys),        intent(inout), optional :: qv_1delt(:,:)
          real(kind_phys),        intent(in)    :: t(:,:), qv(:,:), ps(:)
          character(len=*),       intent(out)   :: errmsg
          integer,                intent(out)   :: errflg
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_radiation_surface.meta
@@ -334,7 +334,7 @@
   units = flag
   dimensions = (horizontal_loop_extent)
   type = integer
-  intent = inout
+  intent = in
 [alvsf]
   standard_name = vis_albedo_strong_cosz
   long_name = mean vis albedo with strong cosz dependency
@@ -390,15 +390,15 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = in
+  intent = inout
 [semis_ice]
   standard_name = surface_longwave_emissivity_over_ice
   long_name = surface lw emissivity in fraction over ice
   units = frac
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = in
+  intent = inout
 [semis_wat]
   standard_name = surface_longwave_emissivity_over_water
   long_name = surface lw emissivity in fraction over water
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
@@ -567,6 +567,7 @@
   units = km
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [idcor]
   standard_name = flag_for_decorrelation_length_method
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmgp_pre.meta
@@ -362,7 +362,6 @@
   type = real
   kind = kind_phys
   intent = inout
-  optional = True
 [tsfg]
   standard_name = surface_ground_temperature_for_radiation
   long_name = surface ground temperature for radiation
@@ -517,7 +516,7 @@
   units = count
   dimensions = ()
   type = integer
-  intent = inout
+  intent = out
 [idxday]
   standard_name = daytime_points
   long_name = daytime points
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_3.meta
@@ -268,7 +268,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = out
+  intent = inout
   optional = True
 [omegain]
   standard_name = physics_timestep_initial_updraft_velocity
@@ -277,7 +277,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = in
+  intent = inout
   optional = True
 [omegaout]
   standard_name = updraft_velocity
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_suite_interstitial_4.meta
@@ -297,7 +297,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = in
 [dtidx]
   standard_name = cumulative_change_of_state_variables_outer_index
   long_name = index of state-variable and process in last dimension of diagnostic tendencies array AKA cumulative_change_index
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_composites_pre.meta
@@ -282,7 +282,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = in
+  intent = inout
 [tprcp]
   standard_name = nonnegative_lwe_thickness_of_precipitation_amount_on_dynamics_timestep
   long_name = total precipitation amount in each time step
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_surface_generic_post.meta
@@ -454,7 +454,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = in
+  intent = inout
   optional = True
 [epi]
   standard_name = instantaneous_surface_potential_evaporation
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/maximum_hourly_diagnostics.meta
@@ -229,7 +229,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = in
 [pratemax]
   standard_name = maximum_precipitation_rate_over_maximum_hourly_time_interval
   long_name = maximum precipitation rate over maximum hourly time interval
diff --git a/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta b/physics/MP/GFDL/v3_2022/gfdl_cloud_microphys_v3.meta
@@ -385,7 +385,7 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = in
 [dtp]
   standard_name = timestep_for_physics
   long_name = physics timestep
diff --git a/physics/MP/NSSL/mp_nssl.meta b/physics/MP/NSSL/mp_nssl.meta
@@ -592,39 +592,39 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
 [rain]
   standard_name = lwe_thickness_of_explicit_rain_amount
   long_name = explicit rain fall on physics timestep
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
 [graupel]
   standard_name = lwe_thickness_of_graupel_amount
   long_name = graupel fall on physics timestep
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
 [ice]
   standard_name = lwe_thickness_of_ice_amount
   long_name = ice fall on physics timestep
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
 [snow]
   standard_name = lwe_thickness_of_snow_amount
   long_name = snow fall on physics timestep
   units = m
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = out
 [sr]
   standard_name = ratio_of_snowfall_to_rainfall
   long_name = ratio of snowfall to large-scale rainfall
@@ -640,7 +640,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = out
+  intent = inout
 [do_radar_ref]
   standard_name = flag_for_radar_reflectivity
   long_name = flag for radar reflectivity
diff --git a/physics/MP/TEMPO/mp_tempo.F90 b/physics/MP/TEMPO/mp_tempo.F90
@@ -440,7 +440,7 @@ subroutine mp_tempo_run(ncol, nlev, con_g, con_rd,           &
          real(kind_phys),           intent(in   ) :: dtp
          logical,                   intent(in   ) :: first_time_step
          integer,                   intent(in   ) :: istep, nsteps
-         real,                      intent(in   ) :: dt_inner
+         real(kind=kind_phys),      intent(in   ) :: dt_inner
          ! Precip/rain/snow/graupel fall amounts and fraction of frozen precip
          real(kind_phys),           intent(inout) :: prcp(:)
          real(kind_phys),           intent(inout), optional :: rain(:)
diff --git a/physics/MP/TEMPO/mp_tempo.meta b/physics/MP/TEMPO/mp_tempo.meta
@@ -774,7 +774,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = out
+  intent = inout
 [max_hail_diam_sfc]
   standard_name = max_hail_diameter_sfc
   long_name = instantaneous maximum hail diameter at lowest model level
@@ -862,6 +862,7 @@
   units = 1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
+  kind = kind_phys
   intent = in
   optional = True
 [spp_mp]
diff --git a/physics/MP/Thompson/mp_thompson.F90 b/physics/MP/Thompson/mp_thompson.F90
@@ -427,7 +427,7 @@ subroutine mp_thompson_run(ncol, nlev, con_g, con_rd,        &
          real(kind_phys),           intent(in   ) :: dtp
          logical,                   intent(in   ) :: first_time_step
          integer,                   intent(in   ) :: istep, nsteps
-         real,                      intent(in   ) :: dt_inner
+         real(kind=kind_phys),      intent(in   ) :: dt_inner
          ! Precip/rain/snow/graupel fall amounts and fraction of frozen precip
          real(kind_phys),           intent(inout) :: prcp(:)
          real(kind_phys),           intent(inout) :: rain(:)
diff --git a/physics/MP/Thompson/mp_thompson.meta b/physics/MP/Thompson/mp_thompson.meta
@@ -780,7 +780,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = out
+  intent = inout
 [max_hail_diam_sfc]
   standard_name = max_hail_diameter_sfc
   long_name = instantaneous maximum hail diameter at lowest model level
@@ -868,6 +868,7 @@
   units = 1
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
+  kind = kind_phys
   intent = in
   optional = True
 [spp_mp]
diff --git a/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta b/physics/PBL/MYNN_EDMF/mynnedmf_wrapper.meta
@@ -109,6 +109,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [con_t0c]
   standard_name = temperature_at_zero_celsius
@@ -362,7 +363,7 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-  intent = inout
+  intent = in
   optional = True
 [prsl]
   standard_name = air_pressure
@@ -1372,6 +1373,7 @@
   units = 1
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [icloud_bl]
   standard_name = control_for_sgs_cloud_radiation_coupling_in_mellor_yamamda_nakanishi_niino_pbl_scheme
diff --git a/physics/PBL/YSU/ysuvdif.meta b/physics/PBL/YSU/ysuvdif.meta
@@ -110,6 +110,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [swh]
   standard_name = tendency_of_air_temperature_due_to_shortwave_heating_on_radiation_timestep
diff --git a/physics/PBL/saYSU/shinhongvdif.meta b/physics/PBL/saYSU/shinhongvdif.meta
@@ -110,6 +110,7 @@
   units = none
   dimensions = ()
   type = real
+  kind = kind_phys
   intent = in
 [ntrac]
   standard_name = number_of_tracers
diff --git a/physics/Radiation/radiation_clouds.f b/physics/Radiation/radiation_clouds.f
@@ -600,7 +600,7 @@ subroutine radiation_clouds_prop                                  &
         end do
       end do
 
-      if (imp_physics == imp_physics_mg) then ! 
+      if (imp_physics == imp_physics_mg) then !
                   ! unified cloud and/or with MG microphysics
 
         if (uni_cld .and. ncndl >= 2) then
@@ -1271,7 +1271,7 @@ subroutine progcld_fer_hires                                      &
           do k = 1, NLAY-1
           do i = 1, IX
              cldtot(i,k) = cld_frac_XuRandall(plyr(i,k), qstl(i,k),     &    
-     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.) 
+     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.)
           end do
           end do
         else
@@ -1280,7 +1280,7 @@ subroutine progcld_fer_hires                                      &
           do k = 1, NLAY-1
           do i = 1, IX
              cldtot(i,k) = cld_frac_XuRandall(plyr(i,k), qstl(i,k),     &    
-     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.) 
+     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.)
           end do
           end do
         endif
@@ -1586,7 +1586,7 @@ subroutine progcld_thompson_wsm6                                  &
           do k = 1, NLAY-1
           do i = 1, IX
              cldtot(i,k) = cld_frac_XuRandall(plyr(i,k), qstl(i,k),     &    
-     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.) 
+     &           rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.)
           end do
           end do
         else
@@ -1597,7 +1597,7 @@ subroutine progcld_thompson_wsm6                                  &
           do i = 1, IX
              cldtot(i,k) = cld_frac_XuRandall(plyr(i,k), qstl(i,k),     &    
      &          rhly(i,k), clwf(i,k), xrc3, xr_exp, 0.,                 &
-     &          cond_cfrac_onRH) 
+     &          cond_cfrac_onRH)
           end do
           end do
         endif
@@ -3152,7 +3152,7 @@ function cld_frac_XuRandall(p_lay, qs_lay, relhum, cld_mr, alpha, & !  ---  inpu
 
 !        ! Parameters
 !        real(kind_phys) :: &
-!           lambda = 0.50  ! , & 
+!           lambda = 0.50  ! , &
 !           P      = 0.25
 
         clwt = 1.0e-6 * (p_lay*0.001)
diff --git a/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta b/physics/SFC_Layer/GFDL/gfdl_sfc_layer.meta
diff --git a/physics/SFC_Layer/UFS/sfc_diag.meta b/physics/SFC_Layer/UFS/sfc_diag.meta
diff --git a/physics/SFC_Models/Lake/CLM/clm_lake.meta b/physics/SFC_Models/Lake/CLM/clm_lake.meta
diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.F90 b/physics/SFC_Models/Lake/Flake/flake_driver.F90
diff --git a/physics/SFC_Models/Lake/Flake/flake_driver.meta b/physics/SFC_Models/Lake/Flake/flake_driver.meta
diff --git a/physics/SFC_Models/Land/RUC/lsm_ruc.meta b/physics/SFC_Models/Land/RUC/lsm_ruc.meta
diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_sice.meta
diff --git a/physics/smoke_dust/rrfs_smoke_wrapper.meta b/physics/smoke_dust/rrfs_smoke_wrapper.meta
