Changeset 735 for codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90

Timestamp:

08/27/18 18:35:24 (6 years ago)

Author:

dubos

Message:

devel : Gassmann (2018) modification of TRiSK Coriolis discretization

File:

• codes/icosagcm/devel/src/dynamics/caldyn_gcm.F90 (modified) (2 diffs)

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

@@ -61 +61 @@
     CASE('energy')
        caldyn_conserv=conserv_energy
+    CASE('energy_gassmann')
+       caldyn_conserv=conserv_gassmann
     CASE('enstrophy')
        caldyn_conserv=conserv_enstrophy
     CASE DEFAULT
        IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_conserv : <', &
-            TRIM(def),'> options are <energy>, <enstrophy>'
+            TRIM(def),'> options are <energy>, <energy_gassmann>, <enstrophy>'
        STOP
     END SELECT
@@ -156 +158 @@
 
   SUBROUTINE allocate_caldyn
-    CALL allocate_field(f_qu,field_u,type_real,llm) 
-    CALL allocate_field(f_qv,field_z,type_real,llm) 
-    CALL allocate_field(f_Kv,field_z,type_real,llm) 
+    CALL allocate_field(f_qu,field_u,type_real,llm, name='qu')
+    CALL allocate_field(f_qv,field_z,type_real,llm, name='qv')
+    CALL allocate_field(f_Kv,field_z,type_real,llm, name='Kv')
+    CALL allocate_field(f_hv,field_z,type_real,llm, name='hv')
     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