Changeset 733 for codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.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_kernels_hevi.F90 (modified) (3 diffs)

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

@@ -580 +580 @@
     SELECT CASE(caldyn_conserv)
 
-    CASE(energy) ! energy-conserving TRiSK
+    CASE(conserv_energy) ! energy-conserving TRiSK
 
        DO l=ll_begin,ll_end
@@ -624 +624 @@
        ENDDO
 
-    CASE(enstrophy) ! enstrophy-conserving TRiSK
+    CASE(conserv_enstrophy) ! enstrophy-conserving TRiSK
 
        DO l=ll_begin,ll_end
@@ -705 +705 @@
     DO l = ll_begin, ll_end
        !  Compute mass fluxes
-       IF (caldyn_conserv==energy) CALL test_message(req_qu) 
+       IF (caldyn_conserv==conserv_energy) CALL test_message(req_qu) 
        !DIR$ SIMD
        DO ij=ij_begin_ext,ij_end_ext