Changeset 130 for codes/icosagcm/trunk/src

Timestamp:

02/06/13 18:56:56 (11 years ago)

Author:

dubos

Message:

dissipation, transport and physics still deactivated

File:

• codes/icosagcm/trunk/src/timeloop_gcm.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -133 +133 @@
        SELECT CASE (TRIM(scheme))
        CASE('euler')
-          CALL  euler_scheme
+          CALL  euler_scheme(.TRUE.)
           
        CASE ('runge_kutta')
@@ -156 +156 @@
        END SELECT
     END DO
+
+!    CALL dissip(f_u,f_du,f_ps,f_phis, f_theta_rhodz,f_dtheta_rhodz)
+!    CALL euler_scheme(.FALSE.)
+
 !    CALL advect_tracer(f_ps,f_u,f_q)
-!    CALL dissip(f_u,f_du,f_ps,f_phis, f_theta_rhodz,f_dtheta_rhodz)
 !    CALL physics(it,f_phis, f_ps, f_theta_rhodz, f_u, f_q)
     ENDDO
@@ -163 +166 @@
   CONTAINS
 
-    SUBROUTINE Euler_scheme
+    SUBROUTINE Euler_scheme(with_dps)
     IMPLICIT NONE
-      INTEGER :: ind
-      
-      DO ind=1,ndomain
-        ps=f_ps(ind) ; u=f_u(ind) ; theta_rhodz=f_theta_rhodz(ind)
-        dps=f_dps(ind) ; du=f_du(ind) ; dtheta_rhodz=f_dtheta_rhodz(ind)
-        ps(:)=ps(:)+dt*dps(:)
-        u(:,:)=u(:,:)+dt*du(:,:)
-        theta_rhodz(:,:)=theta_rhodz(:,:)+dt*dtheta_rhodz(:,:)
-      ENDDO
+    LOGICAL :: with_dps
+    INTEGER :: ind
+      
+    DO ind=1,ndomain
+       IF(with_dps) THEN
+          ps=f_ps(ind) ; dps=f_dps(ind) ; 
+          ps(:)=ps(:)+dt*dps(:)
+       END IF
+       u=f_u(ind) ; theta_rhodz=f_theta_rhodz(ind)
+       du=f_du(ind) ; dtheta_rhodz=f_dtheta_rhodz(ind)
+       u(:,:)=u(:,:)+dt*du(:,:)
+       theta_rhodz(:,:)=theta_rhodz(:,:)+dt*dtheta_rhodz(:,:)
+    ENDDO
       
     END SUBROUTINE Euler_scheme