Changeset 792 for codes/icosagcm

Timestamp:

12/10/18 12:48:58 (5 years ago)

Author:

jisesh

Message:

devel/unstructured : added kernel for curl curl ; used by Baroclinic_3D_ullrich

Location:

codes/icosagcm/devel

Files:

• Python/src/kernels_transport.jin (modified) (2 diffs)
• Python/src/unstructured.pyx (modified) (1 diff)
• Python/test/py/Baroclinic_3D_ullrich.py (modified) (2 diffs)
• src/kernels_unst/curl_laplacian.k90 (added)
• src/unstructured/caldyn_unstructured.F90 (modified) (1 diff)
• src/unstructured/timestep_unstructured.F90 (modified) (1 diff)

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

@@ -312 +312 @@
 
 KERNEL(scalar_laplacian)
-
   FORALL_CELLS_EXT()
     ON_EDGES
@@ -330 +329 @@
 
 END_BLOCK
+
+KERNEL(curl_laplacian)
+  FORALL_CELLS_EXT()
+    ON_DUAL
+      etav = 0.d0
+      FORALL_EDGES
+         etav = etav + SIGN*u(EDGE)
+      END_BLOCK
+      qv(DUAL_CELL) = etav/AV
+    END_BLOCK
+  END_BLOCK
+
+  FORALL_CELLS_EXT()
+    ON_EDGES
+       curlcurl(EDGE) = SIGN*(qv(VERTEX1)-qv(VERTEX2))*(1./LE_DE)
+    END_BLOCK
+  END_BLOCK
+
+END_BLOCK

codes/icosagcm/devel/Python/src/unstructured.pyx

@@ -78 +78 @@
                      ['dynamico_caldyn_unstructured', c_num, c_void_p,20],
                      ['dynamico_scalar_laplacian', c_void_p,2],
+                     ['dynamico_curl_laplacian', c_void_p,2],
                      ['dynamico_partition_graph', c_int,2, c_void_p,3, c_int, c_void_p],
                      ['dynamico_init_transfer', c_int, c_int,2,c_void_p,3, c_int,2,c_void_p,3],

codes/icosagcm/devel/Python/test/py/Baroclinic_3D_ullrich.py

@@ -201 +201 @@
                 caldyn_step.next()
                 davies.relax(llm, caldyn_step, flow0)
-                m,S = caldyn_step.mass, caldyn_step.theta_rhodz
+                m,S,u = caldyn_step.mass, caldyn_step.theta_rhodz, caldyn_step.u
                 s = S/m
-                laps = mesh.field_mass()
-                bilaps = mesh.field_mass()
+                laps, bilaps = mesh.field_mass(), mesh.field_mass()
+                lapu, bilapu = mesh.field_u(), mesh.field_u()
                 unst.ker.dynamico_scalar_laplacian(s,laps)
                 unst.ker.dynamico_scalar_laplacian(laps,bilaps)
+                unst.ker.dynamico_curl_laplacian(u,lapu)
+                unst.ker.dynamico_curl_laplacian(lapu,bilapu)
                 caldyn_step.theta_rhodz[:] = S - dt*kappa*bilaps*m # Euler step
+                caldyn_step.u[:] = u - dt*kappa*bilapu # Euler step
+
             return (caldyn_step.mass.copy(), caldyn_step.theta_rhodz.copy(), caldyn_step.u.copy(),
                     caldyn_step.geopot.copy(), caldyn_step.W.copy())
@@ -230 +234 @@
         v = mesh.field_mass() # specific volume (diagnosed)
         
-        for i in range(Nslice):
+        for i in range(Nslice+1):
             context.update_calendar(i+1)
 

codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

@@ -247 +247 @@
 END SUBROUTINE compute_scalar_laplacian
 
+SUBROUTINE compute_curl_laplacian(u,qv,curlcurl)
+  FIELD_Z   :: qv ! BUF
+  FIELD_U   :: u, curlcurl ! IN,OUT
+  DECLARE_INDICES
+  DECLARE_EDGES
+  DECLARE_VERTICES
+  NUM :: etav
+  START_TRACE(id_scalar_laplacian, 0,0,1)
+#include "../kernels_unst/curl_laplacian.k90"
+  STOP_TRACE
+END SUBROUTINE compute_curl_laplacian
+
 END MODULE caldyn_unstructured_mod

codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90

@@ -29 +29 @@
      !$OMP END PARALLEL
    END SUBROUTINE scalar_laplacian
+
+   SUBROUTINE curl_laplacian(u,lapu) BINDC(curl_laplacian)
+     FIELD_U   :: u,lapu ! IN, OUT
+     FIELD_Z   :: qv  ! BUF
+     !$OMP PARALLEL NUM_THREADS(nb_threads)
+     CALL update_halo(transfer_edge, u)
+     CALL compute_curl_laplacian(u,qv,lapu)
+     !$OMP END PARALLEL
+   END SUBROUTINE curl_laplacian
 
   !