Changeset 561 for codes/icosagcm/trunk/src/dynamics/caldyn_gcm.F90

Timestamp:

09/25/17 14:20:00 (7 years ago)

Author:

dubos

Message:

trunk : backported commits 555-557 from devel

File:

• codes/icosagcm/trunk/src/dynamics/caldyn_gcm.F90 (moved) (moved from codes/icosagcm/trunk/src/dynamics/caldyn_gcm.f90) (2 diffs)

codes/icosagcm/trunk/src/dynamics/caldyn_gcm.F90

@@ -21 +21 @@
     INTEGER            :: ind
     REAL(rstd),POINTER :: planetvel(:)
+
+#ifdef CPP_DYSL
+       IF(is_master) PRINT *,'CPP_DYSL : Using macro-generated compute kernels'
+#endif
 
     hydrostatic=.TRUE.
@@ -118 +122 @@
     CALL allocate_field(f_qv,field_z,type_real,llm) 
     CALL allocate_field(f_pk,    field_t,type_real,llm,  name='pk')
-    CALL allocate_field(f_wwuu,  field_u,type_real,llm+1,name='wwuu')
+    CALL allocate_field(f_wwuu,  field_u,type_real,llm+1,name='wwuu')    
     CALL allocate_field(f_planetvel,  field_u,type_real, name='planetvel') ! planetary velocity at r=a
-
+    IF(.NOT.hydrostatic) THEN
+       CALL allocate_field(f_Fel,      field_u,type_real,llm+1,name='F_el')
+       CALL allocate_field(f_gradPhi2, field_t,type_real,llm+1,name='gradPhi2')
+       CALL allocate_field(f_wil,      field_t,type_real,llm+1,name='w_il')
+       CALL allocate_field(f_Wetadot,  field_t,type_real,llm,name='W_etadot')
+    END IF
   END SUBROUTINE allocate_caldyn