Changeset 940 for codes/icosagcm/devel/src/dynamics/compute_caldyn_Coriolis.F90

Timestamp:

07/05/19 15:13:09 (5 years ago)

Author:

dubos

Message:

devel : DySL for enstrophy-conserving scheme

File:

• codes/icosagcm/devel/src/dynamics/compute_caldyn_Coriolis.F90 (modified) (4 diffs)

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

@@ -1 +1 @@
 MODULE compute_caldyn_Coriolis_mod
   USE prec, ONLY : rstd
+  USE caldyn_vars_mod, ONLY : caldyn_conserv, conserv_energy, conserv_enstrophy, conserv_gassmann
   USE grid_param
   USE earth_const
@@ -46 +47 @@
     END_BLOCK
   END_BLOCK
-!
-  FORALL_CELLS()
-    ON_EDGES
-      du_trisk=0.
-      FORALL_TRISK
-        du_trisk = du_trisk + WEE*hflux(EDGE_TRISK)*(qu(EDGE)+qu(EDGE_TRISK))
-      END_BLOCK
-      du(EDGE) = du(EDGE) + .5*du_trisk
-    END_BLOCK
-  END_BLOCK
-
+  !
+  SELECT CASE(caldyn_conserv)
+  CASE(conserv_energy) ! energy-conserving TRiSK
+     FORALL_CELLS()
+       ON_EDGES
+         du_trisk=0.
+         FORALL_TRISK
+           du_trisk = du_trisk + WEE*hflux(EDGE_TRISK)*(qu(EDGE)+qu(EDGE_TRISK))
+         END_BLOCK
+         du(EDGE) = du(EDGE) + .5*du_trisk
+       END_BLOCK
+     END_BLOCK
+  CASE(conserv_enstrophy) ! enstrophy-conserving TRiSK
+     FORALL_CELLS()
+       ON_EDGES
+         du_trisk=0.
+         FORALL_TRISK
+           du_trisk = du_trisk + WEE*hflux(EDGE_TRISK)
+         END_BLOCK
+         du(EDGE) = du(EDGE) + du_trisk*qu(EDGE)
+       END_BLOCK
+     END_BLOCK
+  END SELECT
 END_BLOCK
 
@@ -65 +78 @@
     USE data_unstructured_mod, ONLY : enter_trace, exit_trace, &
          id_coriolis, left, right, primal_deg, primal_edge, primal_ne, &
-         trisk_deg, trisk, wee ! FIXME wee
+         trisk_deg, trisk
          
     FIELD_U     :: hflux, Ftheta, qu, du ! IN, BUF, IN, INOUT
@@ -80 +93 @@
   SUBROUTINE compute_caldyn_Coriolis_hex(hflux,theta,qu, Ftheta, convm,dtheta_rhodz,du)
     USE icosa
-    USE caldyn_vars_mod
     REAL(rstd),INTENT(IN)    :: hflux(3*iim*jjm,llm)  ! hflux in kg/s
     REAL(rstd),INTENT(IN)    :: theta(iim*jjm,llm,nqdyn) ! active scalars