Changeset 898 for codes/icosagcm/trunk/src/vertical

Timestamp:

06/13/19 16:45:41 (5 years ago)

Author:

adurocher

Message:

trunk : Separate compute/compare loops in compute_rhodz

File:

• codes/icosagcm/trunk/src/vertical/disvert.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/vertical/disvert.f90

@@ -164 +164 @@
     END IF
 
+    IF(comp) THEN
     DO l = ll_begin, ll_end
        DO j=jj_begin-dd,jj_end+dd
@@ -169 +170 @@
              ij=(j-1)*iim+i
              m = ( ap(l) - ap(l+1) + (bp(l)-bp(l+1))*ps(ij) )/g 
-             IF(comp) THEN
                 rhodz(ij,l) = m
+          ENDDO
+        ENDDO
+      ENDDO
              ELSE
+      DO l = ll_begin, ll_end
+        DO j=jj_begin-dd,jj_end+dd
+          DO i=ii_begin-dd,ii_end+dd
+            ij=(j-1)*iim+i
+            m = ( ap(l) - ap(l+1) + (bp(l)-bp(l+1))*ps(ij) )/g
                 err = MAX(err,abs(m-rhodz(ij,l)))
-             END IF
           ENDDO
        ENDDO
     ENDDO
 
-    IF(.NOT. comp) THEN
        IF(err>1e-10) THEN
           PRINT *, 'Discrepancy between ps and rhodz detected', err
           STOP
-       ELSE
-!          PRINT *, 'No discrepancy between ps and rhodz detected'
-       END IF
-    END IF
+      ENDIF
+    ENDIF
 
   END SUBROUTINE compute_rhodz