Changeset 387 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

05/28/16 00:32:21 (8 years ago)

Author:

dubos

Message:

Infrastructure for multiple dynamical tracers - tested with JW06 and moist baroclinic wave

File:

• codes/icosagcm/trunk/src/caldyn_gcm.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -133 +133 @@
     
     REAL(rstd),POINTER :: ps(:), dps(:)
-    REAL(rstd),POINTER :: mass(:,:), theta_rhodz(:,:), dtheta_rhodz(:,:)
+    REAL(rstd),POINTER :: mass(:,:), theta_rhodz(:,:,:), dtheta_rhodz(:,:,:)
     REAL(rstd),POINTER :: u(:,:), du(:,:), hflux(:,:), wflux(:,:)
     REAL(rstd),POINTER :: qu(:,:)
@@ -194 +194 @@
           qu=f_qu(ind)
           qv=f_qv(ind)
-          CALL compute_pvort(ps,u,theta_rhodz, mass,theta,qu,qv) ! COM00 COM01 COM02
+          CALL compute_pvort(ps,u,theta_rhodz(:,:,1), mass,theta,qu,qv) ! COM00 COM01 COM02
        ENDDO
 !       CALL checksum(f_mass)
@@ -208 +208 @@
           ps=f_ps(ind)
           u=f_u(ind)
-          theta_rhodz=f_theta_rhodz(ind)
           mass=f_mass(ind)
           theta = f_theta(ind)
@@ -219 +218 @@
           dtheta_rhodz=f_dtheta_rhodz(ind)
           du=f_du(ind)
-          CALL compute_caldyn_horiz(u,mass,qu,theta,pk,geopot, hflux,convm,dtheta_rhodz,du)
+          CALL compute_caldyn_horiz(u,mass,qu,theta,pk,geopot, hflux,convm,dtheta_rhodz(:,:,1),du)
           IF(caldyn_eta==eta_mass) THEN
              wflux=f_wflux(ind)
              wwuu=f_wwuu(ind)
              dps=f_dps(ind)
-             CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz, du)
+             CALL compute_caldyn_vert(u,theta,mass,convm, wflux,wwuu, dps, dtheta_rhodz(:,:,1), du)
           END IF
        ENDDO       
@@ -245 +244 @@
           qu=f_qu(ind)
           qv=f_qv(ind)
-          CALL compute_pvort(ps,u,theta_rhodz, mass,theta,qu,qv)
+          CALL compute_pvort(ps,u,theta_rhodz(:,:,1), mass,theta,qu,qv)
           pk = f_pk(ind)
           geopot = f_geopot(ind)  
@@ -253 +252 @@
           dtheta_rhodz=f_dtheta_rhodz(ind)
           du=f_du(ind)
-          CALL compute_caldyn_horiz(u,mass,qu,theta,pk,geopot, hflux,convm,dtheta_rhodz,du)
+          CALL compute_caldyn_horiz(u,mass,qu,theta,pk,geopot, hflux,convm,dtheta_rhodz(:,:,1),du)
           IF(caldyn_eta==eta_mass) THEN
              wflux=f_wflux(ind)