Changeset 625

Timestamp:

12/08/17 15:10:22 (6 years ago)

Author:

dubos

Message:

devel : introduced kernels for caldyn_vert (optional)

File:

• codes/icosagcm/devel/Python/src/kernels_caldyn_hevi.jin (modified) (3 diffs)

codes/icosagcm/devel/Python/src/kernels_caldyn_hevi.jin

@@ -1 @@
-KERNEL(caldyn_vert)
+KERNEL(caldyn_wflux)
   SEQUENCE
     BODY('llm-1,1,-1')
@@ -13 +13 @@
     END_BLOCK
   END_BLOCK
-
   ! make sure wflux is up to date
   BARRIER
-  
-  FORALL_CELLS('2','llm')
-    ON_EDGES
-      wwuu(EDGE) = .5*(wflux(CELL1)+wflux(CELL2))*(u(EDGE)-u(DOWN(EDGE)))
-    END_BLOCK
-  END_BLOCK
-
-  ! make sure wwuu is up to date
-  BARRIER
-
+END_BLOCK
+
+KERNEL(caldyn_dmass)
   FORALL_CELLS()
     ON_PRIMAL
-      convm(CELL) = mass_dbk(CELL) * dmass_col(HIDX(CELL)) ! FIXME : we shoud prognose mass_col
-    END_BLOCK
-    ON_EDGES
-      du(EDGE) = du(EDGE) - (wwuu(EDGE)+wwuu(UP(EDGE))) / (rhodz(CELL1)+rhodz(CELL2))
-    END_BLOCK
-  END_BLOCK
+      convm(CELL) = mass_dbk(CELL) * dmass_col(HIDX(CELL))
+    END_BLOCK
+  END_BLOCK
+END_BLOCK
+
+KERNEL(caldyn_vert)
 
   DO iq=1,nqdyn
@@ -47 +39 @@
     END_BLOCK
   END DO
+
+  IF(caldyn_vert_variant == caldyn_vert_cons) THEN
+    ! conservative vertical transport of momentum : (F/m)du/deta = 1/m (d/deta(Fu)-u.dF/deta)
+    FORALL_CELLS('2','llm')
+      ON_EDGES
+        wwuu(EDGE) = .25*(wflux(CELL1)+wflux(CELL2))*(u(EDGE)+u(DOWN(EDGE))) ! Fu
+      END_BLOCK
+    END_BLOCK
+    ! make sure wwuu is up to date
+    BARRIER
+
+    FORALL_CELLS()
+      ON_EDGES
+        dFu_deta = wwuu(UP(EDGE))-wwuu(EDGE)                                          ! d/deta (F*u)
+        dF_deta  = .5*(wflux(UP(CELL1))+wflux(UP(CELL2))-(wflux(CELL1)+wflux(CELL2))) ! d/deta(F)
+        du(EDGE) = du(EDGE) - (dFu_deta-u(EDGE)*dF_deta) / (.5*(rhodz(CELL1)+rhodz(CELL2)))  ! (F/m)du/deta
+      END_BLOCK
+    END_BLOCK
+  ELSE  
+    FORALL_CELLS('2','llm')
+      ON_EDGES
+        wwuu(EDGE) = .5*(wflux(CELL1)+wflux(CELL2))*(u(EDGE)-u(DOWN(EDGE)))
+      END_BLOCK
+    END_BLOCK
+
+    ! make sure wwuu is up to date
+    BARRIER
+
+    FORALL_CELLS()
+      ON_EDGES
+        du(EDGE) = du(EDGE) - (wwuu(EDGE)+wwuu(UP(EDGE))) / (rhodz(CELL1)+rhodz(CELL2))
+      END_BLOCK
+    END_BLOCK
+  END IF
+
 END_BLOCK