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

Timestamp:

08/24/18 14:23:25 (6 years ago)

Author:

dubos

Message:

devel : towards consistent discretization of kinetic energy

File:

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

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

@@ -60 +60 @@
     SELECT CASE(TRIM(def))
     CASE('energy')
-       caldyn_conserv=energy
+       caldyn_conserv=conserv_energy
     CASE('enstrophy')
-       caldyn_conserv=enstrophy
+       caldyn_conserv=conserv_enstrophy
     CASE DEFAULT
        IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_conserv : <', &
@@ -69 +69 @@
     END SELECT
     IF (is_master) PRINT *, 'caldyn_conserv=',def
+
+    def='trisk'
+    CALL getin('caldyn_kinetic',def)
+    SELECT CASE(TRIM(def))
+    CASE('trisk')
+       caldyn_kinetic=kinetic_trisk
+    CASE('consistent')
+       caldyn_kinetic=kinetic_consistent
+    CASE DEFAULT
+       IF (is_mpi_root) PRINT *,'Bad selector for variable caldyn_kinetic : <', &
+            TRIM(def),'> options are <trisk>, <consistent>'
+       STOP
+    END SELECT
+    IF (is_master) PRINT *, 'caldyn_kinetic=',def
 
     nqdyn=1 ! default value
@@ -144 +158 @@
     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_pk,    field_t,type_real,llm,  name='pk')
     CALL allocate_field(f_wwuu,  field_u,type_real,llm+1,name='wwuu')    
@@ -272 +287 @@
 
     SELECT CASE(caldyn_conserv)
-    CASE(energy) ! energy-conserving
+    CASE(conserv_energy) ! energy-conserving
        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE
@@ -333 +348 @@
        ENDDO       
    
-    CASE(enstrophy) ! enstrophy-conserving
+    CASE(conserv_enstrophy) ! enstrophy-conserving
        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE