Changeset 519 for codes/icosagcm/trunk/src/explicit_scheme.f90

Timestamp:

12/24/16 02:33:07 (7 years ago)

Author:

dubos

Message:

Fixed RK2.5 - cleanup to follow

File:

• codes/icosagcm/trunk/src/explicit_scheme.f90 (modified) (7 diffs)

codes/icosagcm/trunk/src/explicit_scheme.f90

@@ -26 +26 @@
     REAL(rstd),POINTER :: u(:,:) , um1(:,:), um2(:,:), du(:,:)
     REAL(rstd),POINTER :: rhodz(:,:), mass(:,:), massm1(:,:), massm2(:,:), dmass(:,:)
-    REAL(rstd),POINTER :: theta_rhodz(:,:) , theta_rhodzm1(:,:), theta_rhodzm2(:,:), dtheta_rhodz(:,:)
+    REAL(rstd),POINTER :: theta_rhodz(:,:,:) , theta_rhodzm1(:,:,:), theta_rhodzm2(:,:,:), dtheta_rhodz(:,:,:)
     REAL(rstd),POINTER :: hflux(:,:),wflux(:,:),hfluxt(:,:),wfluxt(:,:)
     LOGICAL :: fluxt_zero(ndomain) ! set to .TRUE. to start accumulating fluxes in time
     INTEGER :: it,stage
+    
+    CALL legacy_to_DEC(f_ps, f_u)
     DO stage=1,nb_stage
        !       CALL checksum(f_ps)
@@ -53 +55 @@
        END SELECT
     END DO
+    CALL DEC_to_legacy(f_ps, f_u)
 
   CONTAINS
@@ -142 +145 @@
                   um1(ij+u_lup,l)=u(ij+u_lup,l)
                   um1(ij+u_ldown,l)=u(ij+u_ldown,l)
-                  theta_rhodzm1(ij,l)=theta_rhodz(ij,l)
+                  theta_rhodzm1(ij,l,1)=theta_rhodz(ij,l,1)
                ENDDO
             ENDDO
@@ -153 +156 @@
                u(ij+u_lup,l)=um1(ij+u_lup,l)+tau*du(ij+u_lup,l)
                u(ij+u_ldown,l)=um1(ij+u_ldown,l)+tau*du(ij+u_ldown,l)
-               theta_rhodz(ij,l)=theta_rhodzm1(ij,l)+tau*dtheta_rhodz(ij,l)
+               theta_rhodz(ij,l,1)=theta_rhodzm1(ij,l,1)+tau*dtheta_rhodz(ij,l,1)
             ENDDO
          ENDDO
@@ -188 +191 @@
 
          IF (stage==1) THEN
-            psm1(:)=ps(:) ; um1(:,:)=u(:,:) ; theta_rhodzm1(:,:)=theta_rhodz(:,:)
+            psm1(:)=ps(:) ; um1(:,:)=u(:,:) ; theta_rhodzm1(:,:,:)=theta_rhodz(:,:,:)
             ps(:)=psm1(:)+tau*dps(:)
             u(:,:)=um1(:,:)+tau*du(:,:)
-            theta_rhodz(:,:)=theta_rhodzm1(:,:)+tau*dtheta_rhodz(:,:)
+            theta_rhodz(:,:,:)=theta_rhodzm1(:,:,:)+tau*dtheta_rhodz(:,:,:)
 
          ELSE IF (stage==2) THEN
@@ -197 +200 @@
             ps(:)=psm1(:)+tau*dps(:)
             u(:,:)=um1(:,:)+tau*du(:,:)
-            theta_rhodz(:,:)=theta_rhodzm1(:,:)+tau*dtheta_rhodz(:,:)
-
-            psm2(:)=psm1(:) ; theta_rhodzm2(:,:)=theta_rhodzm1(:,:) ; um2(:,:)=um1(:,:) 
-            psm1(:)=ps(:) ; theta_rhodzm1(:,:)=theta_rhodz(:,:) ; um1(:,:)=u(:,:) 
+            theta_rhodz(:,:,:)=theta_rhodzm1(:,:,:)+tau*dtheta_rhodz(:,:,:)
+
+            psm2(:)=psm1(:) ; theta_rhodzm2(:,:,:)=theta_rhodzm1(:,:,:) ; um2(:,:)=um1(:,:) 
+            psm1(:)=ps(:) ; theta_rhodzm1(:,:,:)=theta_rhodz(:,:,:) ; um1(:,:)=u(:,:) 
 
          ELSE 
@@ -206 +209 @@
             ps(:)=psm2(:)+2*tau*dps(:)
             u(:,:)=um2(:,:)+2*tau*du(:,:)
-            theta_rhodz(:,:)=theta_rhodzm2(:,:)+2*tau*dtheta_rhodz(:,:)
-
-            psm2(:)=psm1(:) ; theta_rhodzm2(:,:)=theta_rhodzm1(:,:) ; um2(:,:)=um1(:,:) 
-            psm1(:)=ps(:) ; theta_rhodzm1(:,:)=theta_rhodz(:,:) ; um1(:,:)=u(:,:) 
+            theta_rhodz(:,:,:)=theta_rhodzm2(:,:,:)+2*tau*dtheta_rhodz(:,:,:)
+
+            psm2(:)=psm1(:) ; theta_rhodzm2(:,:,:)=theta_rhodzm1(:,:,:) ; um2(:,:)=um1(:,:) 
+            psm1(:)=ps(:) ; theta_rhodzm1(:,:,:)=theta_rhodz(:,:,:) ; um1(:,:)=u(:,:) 
 
          ENDIF