Merge branch 'main' into ufs-dev-PR302

Author: grantfirl

physics/MP/NSSL/module_mp_nssl_2mom.F90

@@ -10052,6 +10052,8 @@ SUBROUTINE NUCOND    &
 
           IF ( c1 > 0. ) THEN
             ssfilt(ix,jy,kz) = 100.*(an(ix,jy,kz,lv)/c1 - 1.0)  ! from "new" values
+          ELSE
+            ssfilt(ix,jy,kz) = -100.
           ENDIF
 
         ENDDO

physics/PBL/SATMEDMF/satmedmfvdifq.F

@@ -1617,8 +1617,7 @@ subroutine satmedmfvdifq_run(im,km,ntrac,ntcw,ntrw,               &
           endif
         enddo
       enddo
-      
-       do k = kmscu, 1, -1
+      do k = kmscu, 1, -1
         do i = 1, im
           if(scuflg(i) .and.
      &      (k >= mrad(i) .and. k < krad(i))) then

physics/PBL/SATMEDMF/satmedmfvdifq.meta

@@ -819,4 +819,4 @@
   units = 1
   dimensions = ()
   type = integer
-  intent = out
+  intent = out

physics/tools/canopy_utils_mod.f

@@ -1,8 +1,9 @@
        module canopy_utils_mod
-
+        
+        use machine, only : kind_phys 
+        
         implicit none
 
-
        contains
 
 !--------------------------------------------------------------------------
@@ -12,8 +13,8 @@ function IntegrateTrapezoid(x, y)
            !using the trapezoid
            !! approximation. Note that the mesh spacing of x does not
            !have to be uniform.
-           real, intent(in)  :: x(:)                !! Variable x
-           real, intent(in)  :: y(size(x))          !! Function y(x)
+           real(kind=kind_phys), intent(in)  :: x(:)                !! Variable x
+           real(kind=kind_phys), intent(in)  :: y(size(x))          !! Function y(x)
            real              :: IntegrateTrapezoid  !! Integral of y(x)dx
        ! Integrate using the trapezoidal rule
            associate(n => size(x))