Changeset 4946 for LMDZ6/trunk/libf/phylmd/ecrad/radiation/radiation_tripleclouds_lw.F90

Timestamp:

May 18, 2024, 8:07:34 PM (2 weeks ago)

Author:

idelkadi

Message:

The addition of explicit loops with the "omp simd reduction" directive to solve the slowness problem linked to the "sum" command (svn4938 revesion) led to non-reproducibility in MPI and mixed MPI-OMP modes in the case of Tripleclouds and Mcica solvers.
We return to the svn4848 versions of the radiation_tripleclouds_*w.F90 and radiation_mcica_*w.F90 routines.

File:

• LMDZ6/trunk/libf/phylmd/ecrad/radiation/radiation_tripleclouds_lw.F90 (modified) (6 diffs)

LMDZ6/trunk/libf/phylmd/ecrad/radiation/radiation_tripleclouds_lw.F90

@@ -170 +170 @@
     logical :: is_clear_sky_layer(0:nlev+1)
 
-    ! Temporaries to speed up summations
-    real(jprb) :: sum_dn, sum_up
-    
     ! Index of the highest cloudy layer
     integer :: i_cloud_top
@@ -264 +261 @@
       if (config%do_clear) then
         ! Sum over g-points to compute broadband fluxes
-        do jlev = 1,nlev+1
-          sum_up = 0.0_jprb
-          sum_dn = 0.0_jprb
-          !$omp simd reduction(+:sum_up, sum_dn)
-          do jg = 1,ng
-            sum_up = sum_up + flux_up_clear(jg,jlev)
-            sum_dn = sum_dn + flux_dn_clear(jg,jlev)
-          end do
-          flux%lw_up_clear(jcol,jlev) = sum_up
-          flux%lw_dn_clear(jcol,jlev) = sum_dn
-        end do
-
+        flux%lw_up_clear(jcol,:) = sum(flux_up_clear,1)
+        flux%lw_dn_clear(jcol,:) = sum(flux_dn_clear,1)
         ! Store surface spectral downwelling fluxes / TOA upwelling
-        do jg = 1,ng
-          flux%lw_dn_surf_clear_g(jg,jcol) = flux_dn_clear(jg,nlev+1)
-          flux%lw_up_toa_clear_g (jg,jcol) = flux_up_clear(jg,1)
-        end do
+        flux%lw_dn_surf_clear_g(:,jcol) = flux_dn_clear(:,nlev+1)
+        flux%lw_up_toa_clear_g (:,jcol) = flux_up_clear(:,1)
         ! Save the spectral fluxes if required
         if (config%do_save_spectral_flux) then
@@ -468 +453 @@
           end if
         else
-          sum_dn = 0.0_jprb
-          !$omp simd reduction(+:sum_dn)
-          do jg = 1,ng
-            sum_dn = sum_dn + flux_dn_clear(jg,jlev)
-          end do
-          flux%lw_dn(jcol,jlev) = sum_dn
+          flux%lw_dn(jcol,:) = sum(flux_dn_clear(:,jlev))
           if (config%do_save_spectral_flux) then
             call indexed_sum(flux_dn_clear(:,jlev), &
@@ -490 +470 @@
            &  + total_albedo(:,1,i_cloud_top)*flux_dn_clear(:,i_cloud_top)
       flux_up(:,2:) = 0.0_jprb
-
-      sum_up = 0.0_jprb
-      !$omp simd reduction(+:sum_up)
-      do jg = 1,ng
-        sum_up = sum_up + flux_up(jg,1)
-      end do
-      flux%lw_up(jcol,i_cloud_top) = sum_up
-
+      flux%lw_up(jcol,i_cloud_top) = sum(flux_up(:,1))
       if (config%do_save_spectral_flux) then
         call indexed_sum(flux_up(:,1), &
@@ -505 +478 @@
       do jlev = i_cloud_top-1,1,-1
         flux_up(:,1) = trans_clear(:,jlev)*flux_up(:,1) + source_up_clear(:,jlev)
-        sum_up = 0.0_jprb
-        !$omp simd reduction(+:sum_up)
-        do jg = 1,ng
-          sum_up = sum_up + flux_up(jg,1)
-        end do
-        flux%lw_up(jcol,jlev) = sum_up
+        flux%lw_up(jcol,jlev) = sum(flux_up(:,1))
         if (config%do_save_spectral_flux) then
           call indexed_sum(flux_up(:,1), &
@@ -560 +528 @@
 
         ! Store the broadband fluxes
-        sum_up = 0.0_jprb
-        sum_dn = 0.0_jprb
-        do jreg = 1,nregions
-          !$omp simd reduction(+:sum_up, sum_dn)
-          do jg = 1,ng
-            sum_up = sum_up + flux_up(jg,jreg)
-            sum_dn = sum_dn + flux_dn(jg,jreg)
-          end do
-        end do
-        flux%lw_up(jcol,jlev+1) = sum_up
-        flux%lw_dn(jcol,jlev+1) = sum_dn
+        flux%lw_up(jcol,jlev+1) = sum(sum(flux_up,1))
+        flux%lw_dn(jcol,jlev+1) = sum(sum(flux_dn,1))
 
         ! Save the spectral fluxes if required