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

Timestamp:

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

Author:

abarral

Message:

Replace REPROBUS CPP KEY by logical using handmade wonky wrapper

File:

• LMDZ6/branches/Amaury_dev/libf/phylmd/cospv2/MISR_simulator.F90 (modified) (6 diffs)

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

@@ -110 +110 @@
           DO ilev=1,nlev
              ! If there a cloud, start the counter and store this height
-             if(thres_crossed_MISR .eq. 0 .and. dtau(j,ibox,ilev) .gt. 0.) then
+             if(thres_crossed_MISR .eq. 0 .AND. dtau(j,ibox,ilev) .gt. 0.) then
                 ! First encountered a "cloud"
                 thres_crossed_MISR = 1  
@@ -116 +116 @@
              endif
 
-             if( thres_crossed_MISR .lt. 99 .and. thres_crossed_MISR .gt. 0 ) then
+             if( thres_crossed_MISR .lt. 99 .AND. thres_crossed_MISR .gt. 0 ) then
                 if( dtau(j,ibox,ilev) .eq. 0.) then
                    ! We have come to the end of the current cloud layer without yet 
@@ -129 +129 @@
                 ! current layer cloud top to the current level then MISR will like 
                 ! see a top below the top of the current layer.
-                if( dtau(j,ibox,ilev).gt.0 .and. (cloud_dtau-dtau(j,ibox,ilev)) .lt. 1) then
+                if( dtau(j,ibox,ilev).gt.0 .AND. (cloud_dtau-dtau(j,ibox,ilev)) .lt. 1) then
                    if(dtau(j,ibox,ilev) .lt. 1 .or. ilev.eq.1 .or. ilev.eq.nlev) then
                       ! MISR will likely penetrate to some point within this layer ... the middle
@@ -142 +142 @@
                 
                 ! Check for a distinctive water layer
-                if(dtau(j,ibox,ilev) .gt. 1 .and. at(j,ilev) .gt. 273 ) then
+                if(dtau(j,ibox,ilev) .gt. 1 .AND. at(j,ilev) .gt. 273 ) then
                    ! Must be a water cloud, take this as CTH level
                    thres_crossed_MISR=99
@@ -191 +191 @@
 !       ! Adjust based on neightboring points.
 !       do j=2,npoints-1   
-!          if(box_MISR_ztop(j-1,1) .gt. 0                             .and. &
-!             box_MISR_ztop(j+1,1) .gt. 0                             .and. &
-!             abs(box_MISR_ztop(j-1,1)-box_MISR_ztop(j+1,1)) .lt. 500 .and. &
+!          if(box_MISR_ztop(j-1,1) .gt. 0                             .AND. &
+!             box_MISR_ztop(j+1,1) .gt. 0                             .AND. &
+!             abs(box_MISR_ztop(j-1,1)-box_MISR_ztop(j+1,1)) .lt. 500 .AND. &
 !             box_MISR_ztop(j,1) .lt. box_MISR_ztop(j+1,1)) then
 !             box_MISR_ztop(j,1) = box_MISR_ztop(j+1,1)    
@@ -202 +202 @@
 !       do j=1,npoints
 !          do ibox=2,ncol-1  
-!                 if(box_MISR_ztop(j,ibox-1) .gt. 0                                .and. &
-!                 box_MISR_ztop(j,ibox+1) .gt. 0                                .and. &
-!                 abs(box_MISR_ztop(j,ibox-1)-box_MISR_ztop(j,ibox+1)) .lt. 500 .and. &
+!                 if(box_MISR_ztop(j,ibox-1) .gt. 0                                .AND. &
+!                 box_MISR_ztop(j,ibox+1) .gt. 0                                .AND. &
+!                 abs(box_MISR_ztop(j,ibox-1)-box_MISR_ztop(j,ibox+1)) .lt. 500 .AND. &
 !                 box_MISR_ztop(j,ibox) .lt. box_MISR_ztop(j,ibox+1)) then
 !                 box_MISR_ztop(j,ibox) = box_MISR_ztop(j,ibox+1)