Changeset 5185 for LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spartacus_sw.F90

Timestamp:

Sep 11, 2024, 4:27:07 PM (9 days ago)

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spartacus_sw.F90 (modified) (8 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/ecrad/radiation/radiation_spartacus_sw.F90

@@ -493 +493 @@
           end if
 
-          if (config%do_3d_effects .and. &
-               &  allocated(cloud%inv_cloud_effective_size) .and. &
-               &  .not. (nreg == 2 .and. cloud%fraction(jcol,jlev) &
+          if (config%do_3d_effects .AND. &
+               &  allocated(cloud%inv_cloud_effective_size) .AND. &
+               &  .not. (nreg == 2 .AND. cloud%fraction(jcol,jlev) &
                &  > 1.0-config%cloud_fraction_threshold)) then
             if (cloud%inv_cloud_effective_size(jcol,jlev) > 0.0_jprb) then
@@ -662 +662 @@
             ! 3D effects for any further g-points
             if (ng3D == ng &
-                 &  .and. od_region(jg,1) > config%max_gas_od_3D) then
+                 &  .AND. od_region(jg,1) > config%max_gas_od_3D) then
               ng3D = jg-1
             end if
@@ -935 +935 @@
         if ((config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
              &  .or. config%i_3d_sw_entrapment == IEntrapmentExplicit) &
-             &  .and. jlev >= i_cloud_top) then
+             &  .AND. jlev >= i_cloud_top) then
 #else
         if (config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
@@ -969 +969 @@
         ! Account for cloud overlap when converting albedo and source
         ! below a layer interface to the equivalent values just above
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1)) then
           ! If both layers are cloud free, this is trivial...
           total_albedo(:,:,:,jlev) = 0.0_jprb
@@ -1217 +1217 @@
                        &  / max(config%cloud_fraction_threshold, region_fracs(jreg,jlev,jcol))
                   DO jreg4 = 1,nreg ! VIA first lower region (jreg2 is second lower region)
-                    if (.not. (jreg4 == jreg .and. jreg4 /= jreg2)) then
+                    if (.not. (jreg4 == jreg .AND. jreg4 /= jreg2)) then
                       albedo_part(:,jreg3,jreg) = albedo_part(:,jreg3,jreg) + entrapment(:,jreg3,jreg) &
                            &  * v_matrix(jreg4,jreg,jlev,jcol) * total_albedo_below(:,jreg2,jreg4)
@@ -1305 +1305 @@
                        &  / max(config%cloud_fraction_threshold, region_fracs(jreg,jlev,jcol))
                   DO jreg4 = 1,nreg
-                    if (.not. (jreg4 == jreg .and. jreg4 /= jreg2)) then
+                    if (.not. (jreg4 == jreg .AND. jreg4 /= jreg2)) then
                      albedo_part(:,jreg3,jreg) = albedo_part(:,jreg3,jreg) + entrapment(:,jreg3,jreg) &
                            &  * v_matrix(jreg4,jreg,jlev,jcol) * total_albedo_below_direct(:,jreg2,jreg4)
@@ -1329 +1329 @@
         if ((config%i_3d_sw_entrapment == IEntrapmentExplicitNonFractal &
              &  .or. config%i_3d_sw_entrapment == IEntrapmentExplicit) &
-             &  .and. .not. (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev-1))) then
+             &  .AND. .not. (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev-1))) then
           ! Horizontal migration distances are averaged when
           ! applying overlap rules, so equation is
@@ -1525 +1525 @@
         ! Account for overlap rules in translating fluxes just above
         ! a layer interface to the values just below
-        if (is_clear_sky_layer(jlev) .and. is_clear_sky_layer(jlev+1)) then
+        if (is_clear_sky_layer(jlev) .AND. is_clear_sky_layer(jlev+1)) then
           ! Regions in current layer map directly on to regions in
           ! layer below