Changeset 5185 for LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90

Timestamp:

Sep 11, 2024, 4:27:07 PM (2 months ago)

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90 (modified) (3 diffs)

LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/scops.F90

@@ -75 +75 @@
 
     ! Test for valid input overlap assumption
-    if (overlap .ne. 1 .and. overlap .ne. 2 .and. overlap .ne. 3) then
+    if (overlap .ne. 1 .AND. overlap .ne. 2 .AND. overlap .ne. 3) then
        overlap=default_overlap
        call errorMessage('ERROR(scops): Invalid overlap assumption provided. Using default overlap assumption (max/ran)')
@@ -180 +180 @@
              !threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)))
              !maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) .lt. &
-             !     min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .and. &
+             !     min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .AND. &
              !     (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
              if (ilev .ne. 1) then
                 threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)))
                 maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) .lt. &
-                     min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .and. &
+                     min(tca(1:npoints,ilev-1),tca(1:npoints,ilev)) .AND. &
                      (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
              else
                 threshold_min(1:npoints,ibox) = max(conv(1:npoints,ilev),min(0._wp,tca(1:npoints,ilev)))
                 maxosc(1:npoints,ibox) = merge(1,0,threshold(1:npoints,ibox) .lt. &
-                     min(0._wp,tca(1:npoints,ilev)) .and. &
+                     min(0._wp,tca(1:npoints,ilev)) .AND. &
                      (threshold(1:npoints,ibox).gt.conv(1:npoints,ilev)))
              endif
@@ -208 +208 @@
           
           ! Code to partition boxes into startiform and convective parts goes here
-          where(threshold(1:npoints,ibox).le.conv(1:npoints,ilev) .and. conv(1:npoints,ilev).gt.0.) frac_out(1:npoints,ibox,ilev)=2
+          where(threshold(1:npoints,ibox).le.conv(1:npoints,ilev) .AND. conv(1:npoints,ilev).gt.0.) frac_out(1:npoints,ibox,ilev)=2
        ENDDO ! ibox