Changeset 323 for codes

Timestamp:

01/29/15 23:18:18 (9 years ago)

Author:

dubos

Message:

Bugfix - Held & Suarez works again

File:

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

codes/icosagcm/trunk/src/theta_rhodz.f90

@@ -163 +163 @@
     REAL(rstd),INTENT(OUT) :: theta_rhodz(iim*jjm,llm)
     INTEGER,INTENT(IN) :: offset
-    INTEGER :: i,j,ij,l
-    
-!$OMP BARRIER
-    DO    l    = ll_begin, ll_end
-      DO j=jj_begin-offset,jj_end+offset
-        DO i=ii_begin-offset,ii_end+offset
-          ij=(j-1)*iim+i
-          theta_rhodz(ij,l) = theta(ij,l) * ( (ap(l)-ap(l+1)) + ( bp(l)- bp(l+1))* ps(ij) )/g
+    REAL(rstd) :: rhodz
+    INTEGER :: i,j,ij,l
+    
+!$OMP BARRIER
+    DO    l    = ll_begin, ll_end
+      DO j=jj_begin-offset,jj_end+offset
+        DO i=ii_begin-offset,ii_end+offset
+          ij=(j-1)*iim+i
+          rhodz = ( ap(l)-ap(l+1) + (bp(l)-bp(l+1))*ps(ij) )/g
+          theta_rhodz(ij,l) = theta(ij,l) * rhodz
         ENDDO
       ENDDO
@@ -188 +190 @@
     REAL(rstd),INTENT(OUT) :: theta(iim*jjm,llm)
     INTEGER,INTENT(IN) :: offset
-    INTEGER :: i,j,ij,l
-
-!$OMP BARRIER
-    DO    l    = ll_begin, ll_end
-      DO j=jj_begin-offset,jj_end+offset
-        DO i=ii_begin-offset,ii_end+offset
-          ij=(j-1)*iim+i
-          theta(ij,l) = theta_rhodz(ij,l) / ( (ap(l)-ap(l+1)) + ( bp(l)- bp(l+1))* ps(ij) )/g
+    REAL(rstd) :: rhodz
+    INTEGER :: i,j,ij,l
+
+!$OMP BARRIER
+    DO    l    = ll_begin, ll_end
+      DO j=jj_begin-offset,jj_end+offset
+        DO i=ii_begin-offset,ii_end+offset
+          ij=(j-1)*iim+i
+          rhodz = ( ap(l)-ap(l+1) + (bp(l)-bp(l+1))*ps(ij) )/g
+          theta(ij,l) = theta_rhodz(ij,l) / rhodz
         ENDDO
       ENDDO