Changeset 132 for codes/icosagcm/trunk/src/timeloop_gcm.f90

Timestamp:

02/09/13 02:01:07 (11 years ago)

Author:

dubos

Message:

Some steps towards coupling with transport

File:

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

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -17 +17 @@
 !  TYPE(t_field),POINTER :: f_theta(:)
   TYPE(t_field),POINTER :: f_q(:)
-  TYPE(t_field),POINTER :: f_dtheta(:)
+  TYPE(t_field),POINTER :: f_dtheta(:), f_rhodz(:)
   TYPE(t_field),POINTER :: f_ps(:),f_psm1(:), f_psm2(:)
   TYPE(t_field),POINTER :: f_u(:),f_um1(:),f_um2(:)
@@ -69 +69 @@
 ! Tracers
   CALL allocate_field(f_q,field_t,type_real,llm,nqtot)
+  CALL allocate_field(f_rhodz,field_t,type_real,llm)
 
   scheme='runge_kutta'
@@ -119 +120 @@
   CALL transfert_request(f_q,req_i1) 
 
+  CALL advect_tracer_rhodz(f_ps, f_rhodz)  ! save rhodz for transport scheme before dynamics update ps
+
   DO it=0,itaumax
 
@@ -130 +133 @@
 
     DO stage=1,nb_stage
+!       CALL caldyn((stage==1) .AND. (MOD(it,itau_out)==0), &
+!            f_phis,f_ps,f_theta_rhodz,f_u, f_q, &
+!            f_Fe, f_W, f_dps, f_dtheta_rhodz, f_du)
        CALL caldyn((stage==1) .AND. (MOD(it,itau_out)==0), &
-            f_phis,f_ps,f_theta_rhodz,f_u, f_q, f_dps, f_dtheta_rhodz, f_du)
+            f_phis,f_ps,f_theta_rhodz,f_u, f_q, &
+            f_dps, f_dtheta_rhodz, f_du)
        SELECT CASE (TRIM(scheme))
        CASE('euler')
@@ -161 +168 @@
     CALL euler_scheme(.FALSE.)
 
-!    CALL advect_tracer(f_ps,f_u,f_q)
+!    CALL advect_tracer(f_Fe,f_W,f_u, f_q,f_rhodz)  ! update q and rhodz after RK step
 !    CALL physics(it,f_phis, f_ps, f_theta_rhodz, f_u, f_q)
     ENDDO