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

Timestamp:

08/02/15 00:53:35 (9 years ago)

Author:

dubos

Message:

Move geopotential to timeloop, prepare for prognostic geopotential (NH)

File:

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

codes/icosagcm/trunk/src/caldyn.f90

@@ -31 +31 @@
   END SUBROUTINE init_caldyn
 
-  SUBROUTINE caldyn_BC(f_phis, f_wflux)
+  SUBROUTINE caldyn_BC(f_phis, f_geopot, f_wflux)
     USE caldyn_gcm_mod, ONLY : caldyn_gcm_BC=>caldyn_BC
     IMPLICIT NONE
-    TYPE(t_field), POINTER :: f_phis(:), f_wflux(:)
+    TYPE(t_field), POINTER :: f_phis(:), f_geopot(:), f_wflux(:)
     SELECT CASE (TRIM(caldyn_type))
     CASE('gcm')
-       CALL caldyn_gcm_BC(f_phis, f_wflux)
+       CALL caldyn_gcm_BC(f_phis, f_geopot, f_wflux)
     END SELECT
   END SUBROUTINE caldyn_BC
   
   SUBROUTINE caldyn(write_out,f_phis, f_ps, f_mass, f_theta_rhodz, f_u, f_q, &
-       f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du)
+       f_geopot, f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du)
   USE icosa
   USE caldyn_gcm_mod, ONLY : caldyn_gcm=>caldyn
@@ -54 +54 @@
   TYPE(t_field),POINTER :: f_u(:)
   TYPE(t_field),POINTER :: f_q(:)
+  TYPE(t_field),POINTER :: f_geopot(:)
   TYPE(t_field),POINTER :: f_hflux(:)
   TYPE(t_field),POINTER :: f_wflux(:)
@@ -64 +65 @@
       CASE('gcm')
         CALL caldyn_gcm(write_out,f_phis, f_ps, f_mass, f_theta_rhodz, f_u, f_q, &
-             f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du)
+             f_geopot, f_hflux, f_wflux, f_dps, f_dmass, f_dtheta_rhodz, f_du)
       CASE('adv')
         CALL caldyn_adv(write_out,f_phis, f_ps, f_theta_rhodz, f_u, f_q, &