Changeset 134 for codes/icosagcm/trunk/src/caldyn.f90

Timestamp:

02/14/13 18:26:54 (11 years ago)

Author:

dubos

Message:

Time-accumulation of mass fluxes active

File:

• codes/icosagcm/trunk/src/caldyn.f90 (modified) (4 diffs)

codes/icosagcm/trunk/src/caldyn.f90

@@ -20 +20 @@
       CASE('gcm')
         CALL init_caldyn_gcm
-      CASE('adv')
-        CALL init_caldyn_adv
+!      CASE('adv')
+!        CALL init_caldyn_adv
       CASE DEFAULT
         PRINT*,'Bad selector for variable caldyn : <', TRIM(caldyn_type),'> options are <gcm>, <adv>'
@@ -30 +30 @@
   END SUBROUTINE init_caldyn
   
-  SUBROUTINE caldyn(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, f_dps, f_dtheta_rhodz, f_du)
+  SUBROUTINE caldyn(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, &
+       f_hflux, f_wflux, f_dps, f_dtheta_rhodz, f_du)
   USE icosa
   USE caldyn_gcm_mod, ONLY : caldyn_gcm=>caldyn
@@ -41 +42 @@
   TYPE(t_field),POINTER :: f_u(:)
   TYPE(t_field),POINTER :: f_q(:)
+  TYPE(t_field),POINTER :: f_hflux(:)
+  TYPE(t_field),POINTER :: f_wflux(:)
   TYPE(t_field),POINTER :: f_dps(:)
   TYPE(t_field),POINTER :: f_dtheta_rhodz(:)
@@ -47 +50 @@
     SELECT CASE (TRIM(caldyn_type))
       CASE('gcm')
-        CALL caldyn_gcm(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, f_dps, f_dtheta_rhodz, f_du)
-      CASE('adv')
-        CALL caldyn_adv(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, f_dps, f_dtheta_rhodz, f_du)
+        CALL caldyn_gcm(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, &
+             f_hflux, f_wflux, f_dps, f_dtheta_rhodz, f_du)
+!      CASE('adv')
+!        CALL caldyn_adv(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, f_dps, f_dtheta_rhodz, f_du)
     END SELECT