Revert "Make aerosol number concentration a true optional arg."

This reverts commit 0030ddf.
NCAR · Jan 7, 2025 · af52b1f · af52b1f
1 parent a6026a2
commit af52b1f
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.fv3.F90
@@ -116,7 +116,7 @@ subroutine GFS_phys_time_vary_init (
 
          integer,              intent(inout), optional :: jindx1_aer(:), jindx2_aer(:), iindx1_aer(:), iindx2_aer(:)
          real(kind_phys),      intent(inout), optional :: ddy_aer(:), ddx_aer(:)
-         real(kind_phys),      intent(out)  , optional :: aer_nm(:,:,:)
+         real(kind_phys),      intent(out)   :: aer_nm(:,:,:)
          integer,              intent(inout), optional :: jindx1_ci(:), jindx2_ci(:), iindx1_ci(:), iindx2_ci(:)
          real(kind_phys),      intent(inout), optional :: ddy_ci(:), ddx_ci(:)
          integer,              intent(inout) :: imap(:), jmap(:)
@@ -729,7 +729,7 @@ subroutine GFS_phys_time_vary_timestep_init (
          real(kind_phys),      intent(inout) :: ozpl(:,:,:), h2opl(:,:,:)
          integer,              intent(in), optional    :: jindx1_aer(:), jindx2_aer(:), iindx1_aer(:), iindx2_aer(:)
          real(kind_phys),      intent(in), optional    :: ddy_aer(:), ddx_aer(:)
-         real(kind_phys),      intent(inout), optional :: aer_nm(:,:,:)
+         real(kind_phys),      intent(inout) :: aer_nm(:,:,:)
          integer,              intent(in), optional    :: jindx1_ci(:), jindx2_ci(:), iindx1_ci(:), iindx2_ci(:)
          real(kind_phys),      intent(in), optional    :: ddy_ci(:), ddx_ci(:)
          real(kind_phys),      intent(inout) :: in_nm(:,:), ccn_nm(:,:)

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
@@ -247,7 +247,6 @@
   type = real
   kind = kind_phys
   intent = out
-  optional = True
 [jindx1_ci]
   standard_name = lower_latitude_index_of_cloud_nuclei_forcing_for_interpolation
   long_name = interpolation low index for ice and cloud condensation nuclei in the y direction
@@ -1385,7 +1384,6 @@
   type = real
   kind = kind_phys
   intent = inout
-  optional = True
 [jindx1_ci]
   standard_name = lower_latitude_index_of_cloud_nuclei_forcing_for_interpolation
   long_name = interpolation low index for ice and cloud condensation nuclei in the y direction

diff --git a/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90 b/physics/Interstitials/UFS_SCM_NEPTUNE/GFS_phys_time_vary.scm.F90
@@ -92,7 +92,7 @@ subroutine GFS_phys_time_vary_init (
          real(kind_phys),      intent(in)    :: h2opl(:,:,:)
          integer,              intent(inout), optional :: jindx1_aer(:), jindx2_aer(:), iindx1_aer(:), iindx2_aer(:)
          real(kind_phys),      intent(inout), optional :: ddy_aer(:), ddx_aer(:)
-         real(kind_phys),      intent(in)   , optional :: aer_nm(:,:,:)
+         real(kind_phys),      intent(in)    :: aer_nm(:,:,:)
          integer,              intent(inout), optional :: jindx1_ci(:), jindx2_ci(:), iindx1_ci(:), iindx2_ci(:)
          real(kind_phys),      intent(inout), optional :: ddy_ci(:), ddx_ci(:)
          integer,              intent(inout) :: imap(:), jmap(:)
@@ -215,7 +215,7 @@ subroutine GFS_phys_time_vary_init (
             ! Update the value of ntrcaer in aerclm_def with the value defined
             ! in GFS_typedefs.F90 that is used to allocate the Tbd DDT.
             ! If iaerclm is .false., then ntrcaer == 1
-            ntrcaer = 1
+            ntrcaer = size(aer_nm, dim=3)
          endif
 
 !> - Call iccninterp::read_cidata() to read IN and CCN data
@@ -667,7 +667,7 @@ subroutine GFS_phys_time_vary_timestep_init (
          real(kind_phys),      intent(inout) :: ozpl(:,:,:), h2opl(:,:,:)
          integer,              intent(in), optional :: jindx1_aer(:), jindx2_aer(:), iindx1_aer(:), iindx2_aer(:)
          real(kind_phys),      intent(in), optional :: ddy_aer(:), ddx_aer(:)
-         real(kind_phys),      intent(inout), optional :: aer_nm(:,:,:)
+         real(kind_phys),      intent(inout) :: aer_nm(:,:,:)
          integer,              intent(in), optional :: jindx1_ci(:), jindx2_ci(:), iindx1_ci(:), iindx2_ci(:)
          real(kind_phys),      intent(in), optional :: ddy_ci(:), ddx_ci(:)
          real(kind_phys),      intent(inout) :: in_nm(:,:), ccn_nm(:,:)

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
@@ -246,7 +246,6 @@
   type = real
   kind = kind_phys
   intent = in
-  optional = True
 [jindx1_ci]
   standard_name = lower_latitude_index_of_cloud_nuclei_forcing_for_interpolation
   long_name = interpolation low index for ice and cloud condensation nuclei in the y direction
@@ -1377,7 +1376,6 @@
   type = real
   kind = kind_phys
   intent = inout
-  optional = True
 [jindx1_ci]
   standard_name = lower_latitude_index_of_cloud_nuclei_forcing_for_interpolation
   long_name = interpolation low index for ice and cloud condensation nuclei in the y direction