Changeset 877

Timestamp:

05/29/19 11:16:16 (5 years ago)

Author:

jisesh

Message:

devel: moved DYSL into compute_caldyn_slow_hydro.F90

Location:

codes/icosagcm/devel

Files:

• Python/src/kernels_caldyn_hydro.jin (modified) (1 diff)
• src/dynamics/compute_caldyn_slow_hydro.F90 (modified) (1 diff)

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

@@ -93 +93 @@
 END_BLOCK
 
-KERNEL(caldyn_slow_hydro)
-  FORALL_CELLS_EXT()
-    ON_EDGES
-      uu = .5*(rhodz(CELL1)+rhodz(CELL2))*u(EDGE)
-      hflux(EDGE) = uu*LE_DE
-    END_BLOCK
-  END_BLOCK
-
-  FORALL_CELLS()
-    ON_PRIMAL
-      ke=0.d0
-      FORALL_EDGES
-        ke = ke + LE_DE*u(EDGE)**2
-      END_BLOCK
-      BERNI(CELL)=ke*(.25/AI)
-    END_BLOCK
-  END_BLOCK
-  IF(zero) THEN
-    FORALL_CELLS()
-      ON_EDGES
-        du(EDGE) = SIGN*(berni(CELL1)-berni(CELL2)) ! minus gradient
-      END_BLOCK
-    END_BLOCK
-  ELSE
-    FORALL_CELLS()
-      ON_EDGES
-        du(EDGE) = du(EDGE) + SIGN*(berni(CELL1)-berni(CELL2)) ! minus gradient
-      END_BLOCK
-    END_BLOCK
-  END IF
-
-END_BLOCK

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

@@ -4 +4 @@
   PRIVATE
 
+#include "../unstructured/unstructured.h90"
+
   PUBLIC :: compute_caldyn_slow_hydro
 
 CONTAINS
+
+#ifdef BEGIN_DYSL
+
+KERNEL(caldyn_slow_hydro)
+  FORALL_CELLS_EXT()
+    ON_EDGES
+      uu = .5*(rhodz(CELL1)+rhodz(CELL2))*u(EDGE)
+      hflux(EDGE) = uu*LE_DE
+    END_BLOCK
+  END_BLOCK
+
+  FORALL_CELLS()
+    ON_PRIMAL
+      ke=0.d0
+      FORALL_EDGES
+        ke = ke + LE_DE*u(EDGE)**2
+      END_BLOCK
+      BERNI(CELL)=ke*(.25/AI)
+    END_BLOCK
+  END_BLOCK
+  IF(zero) THEN
+    FORALL_CELLS()
+      ON_EDGES
+        du(EDGE) = SIGN*(berni(CELL1)-berni(CELL2)) ! minus gradient
+      END_BLOCK
+    END_BLOCK
+  ELSE
+    FORALL_CELLS()
+      ON_EDGES
+        du(EDGE) = du(EDGE) + SIGN*(berni(CELL1)-berni(CELL2)) ! minus gradient
+      END_BLOCK
+    END_BLOCK
+  END IF
+
+END_BLOCK
+
+#endif END_DYSL
+
+  SUBROUTINE compute_caldyn_slow_hydro_unst(rhodz,theta,u, berni,hflux,du)
+    USE ISO_C_BINDING, only : C_DOUBLE, C_FLOAT
+    USE grid_param, ONLY : nqdyn
+    USE data_unstructured_mod, ONLY :left,right,edge_num,primal_num,dual_num,id_slow_hydro, &
+        primal_deg,le_de,primal_edge,Ai,enter_trace, exit_trace
+    FIELD_MASS  :: rhodz,berni! IN
+    FIELD_THETA :: theta      ! IN
+    FIELD_U     :: u,hflux,du ! IN, OUT, OUT
+    DECLARE_INDICES
+    DECLARE_EDGES
+    LOGICAL, PARAMETER :: zero=.TRUE.
+    NUM :: ke, uu
+    START_TRACE(id_slow_hydro, 3,0,3)
+#include "../kernels_unst/caldyn_slow_hydro.k90"
+    STOP_TRACE
+  END SUBROUTINE compute_caldyn_slow_hydro_unst
 
   SUBROUTINE compute_caldyn_slow_hydro(u,rhodz,hv, hflux,Kv,du, zero)