Merge pull request #3 from grantfirl/feature/stoch_spp_gjf

Fix the rest of the Cheyenne/GNU tests
climbfuji · Feb 22, 2022 · f77322b · f77322b
2 parents f07475c + 88d0dd3
commit f77322b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/physics/module_bl_mynn.F90 b/physics/module_bl_mynn.F90
@@ -4669,9 +4669,10 @@ SUBROUTINE mynn_bl_driver(            &
     LOGICAL :: INITIALIZE_QKE
 
 ! Stochastic fields 
-     INTEGER,  INTENT(IN)                                     ::spp_pbl
-     REAL, DIMENSION( ims:ime, kms:kme), INTENT(IN),OPTIONAL  ::pattern_spp_pbl
-     REAL, DIMENSION(KTS:KTE)                         ::    rstoch_col
+     INTEGER,  INTENT(IN)                             :: spp_pbl
+     !GJF: this array must be assumed-shape since it's conditionally-allocated
+     REAL, DIMENSION(:,:), INTENT(IN)                 :: pattern_spp_pbl
+     REAL, DIMENSION(KTS:KTE)                         :: rstoch_col
 
 ! Substepping TKE
      INTEGER :: nsub

diff --git a/physics/module_sf_mynn.F90 b/physics/module_sf_mynn.F90
@@ -295,7 +295,8 @@ SUBROUTINE SFCLAY_mynn(                           &
                                                           U3D,V3D, &
                                                         th3d,pi3d
 
-      REAL, DIMENSION( ims:ime, kms:kme), OPTIONAL,                &
+      !GJF: This array must be assumed-shape since it is conditionally-allocated
+      REAL, DIMENSION( :,: ),                                      &
                 INTENT(IN) ::                      pattern_spp_sfc
 !===================================
 ! 2D VARIABLES
@@ -3765,4 +3766,3 @@ REAL function psih_unstable(zolf,psi_opt)
 !========================================================================
 
 END MODULE module_sf_mynn
-