Merge remote-tracking branch 'origin/cam_ifx_CTSM' into cam_ifx

Author: cacraigucar

.gitmodules

@@ -124,8 +124,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/RTM
 
 [submodule "mosart"]
 path = components/mosart
-url = https://github.com/ESCOMP/MOSART
-fxtag = mosart1.1.12
+url = https://github.com/billsacks/MOSART
+fxtag = 7aa48b1
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
 
@@ -187,8 +187,8 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
 
 [submodule "clm"]
 path = components/clm
-url = https://github.com/ESCOMP/CTSM
-fxtag = alpha-ctsm5.4.CMIP7.09.ctsm5.3.068
+url = https://github.com/billsacks/CTSM
+fxtag = c7230f0
 fxrequired = ToplevelRequired
 fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
 

src/dynamics/se/dyn_comp.F90

@@ -2217,7 +2217,18 @@ subroutine read_dyn_field_2d(fieldname, fh, dimname, buffer)
    ! to NaN.  In that case infld can return NaNs where the element GLL points
    ! are not "unique columns"
    ! Set NaNs or fillvalue points to zero
-   where (isnan(buffer) .or. (buffer==fillvalue)) buffer = 0.0_r8
+   where (isnan(buffer))
+      ! check for NaN first, as comparing NaN to fillvalue raises floating invalid.
+      buffer = 0.0_r8
+   end where
+
+   if (.not. isnan(fillvalue)) then
+      ! only compare against fillvalue if fillvalue is not NaN, otherwise the comparison
+      ! will raise floating invalid.
+      where (buffer == fillvalue)
+         buffer = 0.0_r8
+      end where
+   end if
 
 end subroutine read_dyn_field_2d
 
@@ -2247,7 +2258,18 @@ subroutine read_dyn_field_3d(fieldname, fh, dimname, buffer)
    ! to NaN.  In that case infld can return NaNs where the element GLL points
    ! are not "unique columns"
    ! Set NaNs or fillvalue points to zero
-   where (isnan(buffer) .or. (buffer == fillvalue)) buffer = 0.0_r8
+   where (isnan(buffer))
+      ! check for NaN first, as comparing NaN to fillvalue raises floating invalid.
+      buffer = 0.0_r8
+   end where
+
+   if (.not. isnan(fillvalue)) then
+      ! only compare against fillvalue if fillvalue is not NaN, otherwise the comparison
+      ! will raise floating invalid.
+      where (buffer == fillvalue)
+         buffer = 0.0_r8
+      end where
+   end if
 
 end subroutine read_dyn_field_3d
 

src/ionosphere/waccmx/edyn_mpi.F90

@@ -1684,7 +1684,7 @@ subroutine mp_mag_jslot(fin,mlon00,mlon11,mlat00,mlat11, &
       integer :: ier,njneed,i,j,n,nj,idest, &
            icount,len,nlons,isrc,msgid,ifld,sndbuf_cntr
       integer :: tij ! rank in cols_comm (0 to nmagtaskj-1)
-      integer :: jhave(mxneed),njhave,wid
+      integer :: jhave(mxneed),njhave
       integer :: peersneed(mxneed,0:nmagtaskj-1)
       integer :: jneedall (mxneed,0:nmagtaskj-1)
       real(r8) :: sndbuf(mxmaglon+2,mxneed,nf,sndbuf_cntr_max)
@@ -1730,7 +1730,6 @@ subroutine mp_mag_jslot(fin,mlon00,mlon11,mlat00,mlat11, &
                njhave = njhave+1
                jhave(njhave) = peersneed(j,n)
                idest = n
-               wid = itask_table_geo(mytidi,idest)
             endif
          enddo
          if (njhave > 0) then
@@ -1749,7 +1748,9 @@ subroutine mp_mag_jslot(fin,mlon00,mlon11,mlat00,mlat11, &
                enddo
             enddo
             len = nlons*njhave*nf
-            msgid = mytid+wid*10000
+            ! sending tag uniquely identifies sender - tij is comm. rank
+            ! within this communicator only.
+            msgid = tij
             call mpi_ibsend(sndbuf(1:nlons,1:njhave,:,sndbuf_cntr),len,MPI_REAL8, &
                  idest,msgid,cols_comm,ibsend_requests(sndbuf_cntr),ier)
             if (ier /= 0) &
@@ -1783,7 +1784,8 @@ subroutine mp_mag_jslot(fin,mlon00,mlon11,mlat00,mlat11, &
                isrc = tasks(n)%magtidj ! task id in cols_comm to recv from
                nlons = mlon11-mlon00+1
                len = nlons*njhave*nf
-               msgid = mytid*10000+n
+               ! receive tag is sender rank (tij from sender == magtidj)
+               msgid = isrc
                rcvbuf = 0._r8
                call mpi_recv(rcvbuf(1:nlons,1:njhave,:),len,MPI_REAL8, &
                     isrc,msgid,cols_comm,irstat,ier)

src/physics/rrtmgp/rrtmgp_inputs_cam.F90

@@ -198,11 +198,19 @@ subroutine rrtmgp_set_aer_sw( &
          ! set aerosol optical depth, clip to zero
          aer_sw%optical_props%tau(i,ktoprad:,:) = max(aer_tau(idxday(i),ktopcam:,:), 0._r8)
          ! set value of single scattering albedo
-         aer_sw%optical_props%ssa(i,ktoprad:,:) = merge(aer_tau_w(idxday(i),ktopcam:,:)/aer_tau(idxday(i),ktopcam:,:), &
-                                          1._r8, aer_tau(idxday(i),ktopcam:,:) > 0._r8)
+         where (aer_tau(idxday(i),ktopcam:,:) > 0._r8)
+            aer_sw%optical_props%ssa(i,ktoprad:,:) = aer_tau_w(idxday(i),ktopcam:,:) &
+                                                   / aer_tau(idxday(i),ktopcam:,:)
+         elsewhere
+            aer_sw%optical_props%ssa(i,ktoprad:,:) = 1._r8
+         end where
          ! set value of asymmetry
-         aer_sw%optical_props%g(i,ktoprad:,:) = merge(aer_tau_w_g(idxday(i),ktopcam:,:)/aer_tau_w(idxday(i),ktopcam:,:), &
-                                        0._r8, aer_tau_w(idxday(i),ktopcam:,:) > tiny)
+         where (aer_tau_w(idxday(i),ktopcam:,:) > tiny)
+            aer_sw%optical_props%g(i,ktoprad:,:) = aer_tau_w_g(idxday(i),ktopcam:,:) &
+                                                 / aer_tau_w(idxday(i),ktopcam:,:)
+         elsewhere
+            aer_sw%optical_props%g(i,ktoprad:,:) = 0._r8
+         end where
       end do
 
       ! impose limits on the components