Merge pull request #228 from grantfirl/rrfsv1-to-ufs/dev2

Second reconciliation PR from production/RRFS.v1
ufs-community · Nov 8, 2024 · 002a886 · 002a886
2 parents f3eeb34 + 0678f44
commit 002a886
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 8 deletions.
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.F90
@@ -208,7 +208,7 @@ subroutine GFS_rrtmg_pre_run (im, levs, lm, lmk, lmp, n_var_lndp, lextop,&
       real(kind=kind_phys), dimension(:,:,:), intent(out) :: faerlw1,&
                                                              faerlw2,&
                                                              faerlw3
-      real(kind=kind_phys), dimension(:,:),   intent(out) :: alpha
+      real(kind=kind_phys), dimension(:,:),   intent(out), optional :: alpha
       character(len=*), intent(out) :: errmsg
       integer,          intent(out) :: errflg
 

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_rrtmg_pre.meta
@@ -1474,6 +1474,7 @@
   type = real
   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

diff --git a/physics/Radiation/RRTMG/radlw_main.F90 b/physics/Radiation/RRTMG/radlw_main.F90
@@ -630,7 +630,8 @@ subroutine rrtmg_lw_run                                           &
 
       real (kind=kind_phys), dimension(:), intent(in) :: sfemis,        &
      &       sfgtmp, de_lgth
-      real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
+      real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
+             alpha
 
       real (kind=kind_phys), dimension(:,:,:),intent(in)::              &
      &       aeraod, aerssa

diff --git a/physics/Radiation/RRTMG/radlw_main.meta b/physics/Radiation/RRTMG/radlw_main.meta
@@ -199,6 +199,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [npts]
   standard_name = horizontal_loop_extent
   long_name = horizontal dimension

diff --git a/physics/Radiation/RRTMG/radsw_main.F90 b/physics/Radiation/RRTMG/radsw_main.F90
@@ -726,7 +726,8 @@ subroutine rrtmg_sw_run                                           &
 
       real (kind=kind_phys), intent(in) :: cosz(npts), solcon,          &
      &       de_lgth(npts)
-      real (kind=kind_phys), dimension(npts,nlay), intent(in) :: alpha
+      real (kind=kind_phys), dimension(npts,nlay),intent(in),optional:: &
+             alpha
 
 !  ---  outputs:
       real (kind=kind_phys), dimension(:,:), intent(inout) :: hswc

diff --git a/physics/Radiation/RRTMG/radsw_main.meta b/physics/Radiation/RRTMG/radsw_main.meta
@@ -223,6 +223,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [cosz]
   standard_name = cosine_of_solar_zenith_angle_for_daytime_points_on_radiation_timestep
   long_name = cosine of the solar zenit angle

diff --git a/physics/SFC_Models/Land/RUC/lsm_ruc.F90 b/physics/SFC_Models/Land/RUC/lsm_ruc.F90
@@ -455,12 +455,13 @@ subroutine lsm_ruc_run                                            & ! inputs
      ! for land
      &       sncovr1_lnd, qsurf_lnd, gflux_lnd, evap_lnd,                &
      &       cmm_lnd, chh_lnd, hflx_lnd, sbsno,                          &
-     &       acsnow_lnd, snowmt_lnd, snohf,                              &
+     &       snowmt_lnd, snohf,                                          &
      ! for ice
      &       sncovr1_ice, qsurf_ice, gflux_ice, evap_ice, ep1d_ice,      &
      &       cmm_ice, chh_ice, hflx_ice,                                 &
-     &       acsnow_ice, snowmt_ice
-
+     &       snowmt_ice
+      real (kind_phys), dimension(:), intent(inout), optional ::         &
+             acsnow_lnd, acsnow_ice
       real (kind_phys), dimension(:), intent(  out) ::                   &
      &       albdvis_lnd, albdnir_lnd,  albivis_lnd,  albinir_lnd
       real (kind_phys), dimension(:), intent(  out), optional ::         &

diff --git a/physics/SFC_Models/Land/RUC/lsm_ruc.meta b/physics/SFC_Models/Land/RUC/lsm_ruc.meta
@@ -1489,6 +1489,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [snowmt_lnd]
   standard_name = surface_snow_melt_over_land
   long_name = snow melt during timestep over land
@@ -1653,6 +1654,7 @@
   type = real
   kind = kind_phys
   intent = inout
+  optional = True
 [snowmt_ice]
   standard_name = surface_snow_melt_over_ice
   long_name = snow melt during timestep over ice

diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_cice.f b/physics/SFC_Models/SeaIce/CICE/sfc_cice.f
@@ -101,8 +101,10 @@ subroutine sfc_cice_run                                           &
 
 !     real (kind=kind_phys), dimension(im), intent(in) :: u1, v1,       &
       real (kind=kind_phys), dimension(:), intent(in) ::                &
-     &       t1, q1, cm, ch, prsl1, wind, snowd
-
+     &       t1, q1, cm, ch, prsl1, wind
+      real (kind=kind_phys), dimension(:), intent(in), optional ::      &
+     &       snowd 
+
       real (kind=kind_phys), dimension(:), intent(in), optional ::      &
      &       dqsfc, dtsfc, dusfc, dvsfc
       logical, dimension(:), intent(in) :: flag_cice, flag_iter

diff --git a/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta b/physics/SFC_Models/SeaIce/CICE/sfc_cice.meta
@@ -160,6 +160,7 @@
   type = real
   kind = kind_phys
   intent = in
+  optional = True
 [qsurf]
   standard_name = surface_specific_humidity_over_ice
   long_name = surface air saturation specific humidity over ice