Changeset 784 for codes/icosagcm

Timestamp:

11/21/18 16:16:06 (6 years ago)

Author:

jisesh

Message:

devel/unstructured : laplacian operator

Location:

codes/icosagcm/devel

Files:

• Python/src/kernels_transport.jin (modified) (1 diff)
• Python/src/unstructured.pyx (modified) (1 diff)
• src/kernels_unst/scalar_laplacian.k90 (added)
• src/unstructured/caldyn_unstructured.F90 (modified) (1 diff)
• src/unstructured/data_unstructured.F90 (modified) (2 diffs)
• src/unstructured/timestep_unstructured.F90 (modified) (1 diff)

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

@@ -310 +310 @@
     END_BLOCK
 END_BLOCK
+
+KERNEL(scalar_laplacian)
+
+  FORALL_CELLS_EXT()
+    ON_EDGES
+       grad(EDGE) = SIGN*(b(CELL2)-b(CELL1))
+    END_BLOCK
+  END_BLOCK
+
+  FORALL_CELLS_EXT()
+    ON_PRIMAL
+      div_ij=0.
+      FORALL_EDGES
+        div_ij = div_ij + SIGN*LE_DE*grad(EDGE)
+      END_BLOCK
+      divu(CELL) = div_ij / AI
+    END_BLOCK
+  END_BLOCK
+
+END_BLOCK

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

@@ -77 +77 @@
                      ['dynamico_init_hybrid', c_void_p,3],
                      ['dynamico_caldyn_unstructured', c_num, c_void_p,20],
+                     ['dynamico_scalar_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/src/unstructured/caldyn_unstructured.F90

@@ -236 +236 @@
 END SUBROUTINE
 
+SUBROUTINE compute_scalar_laplacian(b,grad,divu)
+  FIELD_MASS   :: b, divu ! IN, OUT
+  FIELD_U      :: grad ! BUF
+  DECLARE_INDICES
+  DECLARE_EDGES
+  NUM :: div_ij
+  START_TRACE(id_scalar_laplacian, 0,0,1)
+#include "../kernels_unst/scalar_laplacian.k90"
+  STOP_TRACE
+END SUBROUTINE compute_scalar_laplacian
+
 END MODULE caldyn_unstructured_mod

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

@@ -46 +46 @@
   INTEGER, PARAMETER :: id_dev1=1, id_dev2=2, &
        id_pvort_only=3, id_slow_hydro=4, id_fast=5, id_coriolis=6, id_theta=7, id_geopot=8, id_vert=9, &
-       id_solver=10, id_slow_NH=11, id_NH_geopot=12, id_vert_NH=13, id_update=14, id_halo=15, nb_routines=15 
+       id_solver=10, id_slow_NH=11, id_NH_geopot=12, id_vert_NH=13, id_update=14, id_halo=15, &
+       id_scalar_laplacian=16, nb_routines=16 
   TIME, PRIVATE :: start_time, time_spent(nb_routines) ! time spent in each kernel
   INTEGER, PRIVATE :: current_id, nb_calls(nb_routines)
@@ -53 +54 @@
        (/'dev1      ', 'dev2      ', &
        'pvort_only', 'slow_hydro', 'fast      ', 'coriolis  ', 'theta     ', 'geopot    ', 'vert      ', &
-       'solver    ', 'slow_NH   ', 'NH_geopot ', 'vert_NH   ',  'update    ', 'halo_xchg ' /)
+       'solver    ', 'slow_NH   ', 'NH_geopot ', 'vert_NH   ',  'update    ', 'halo_xchg ', 'scalar_lap' /)
 
   INTEGER, PARAMETER ::transfer_primal=1, transfer_edge=2, transfer_dual=3, transfer_max=3

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

@@ -21 +21 @@
 #define HASNAN(field) (ANY(.NOT.ABS(field)<1e20))
 
+   SUBROUTINE scalar_laplacian(s,laps) BINDC(scalar_laplacian)
+     FIELD_MASS   :: s,laps ! IN, OUT
+     FIELD_U      :: grads  ! BUF
+     !$OMP PARALLEL NUM_THREADS(nb_threads)
+     CALL update_halo(transfer_primal, s)
+     CALL compute_scalar_laplacian(s,grads,laps)
+     !$OMP END PARALLEL
+   END SUBROUTINE scalar_laplacian
+
+  !
   SUBROUTINE caldyn_unstructured(tau, mass_col,rhodz,theta_rhodz,u,geopot,w, & ! IN : flow state
                                  theta,ps,pk,hflux,qv, &    ! OUT : diags (except surface geopot : IN)