Changeset 658 for codes/icosagcm/devel/src/unstructured

Timestamp:

12/30/17 02:00:38 (7 years ago)

Author:

dubos

Message:

devel/unstructured : updated kernels

Location:

codes/icosagcm/devel/src/unstructured

Files:

• caldyn_unstructured.F90 (modified) (12 diffs)
• data_unstructured.F90 (modified) (1 diff)
• timestep_unstructured.F90 (modified) (2 diffs)

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

@@ -21 +21 @@
 #define DECLARE_VERTICES INTEGER VERTICES
 #define PHI_BOT(ij) Phi_bot
-#define PHI_BOT_VAR 0.
 
 #define BINDC_(thename) BIND(C, name=#thename)
@@ -40 +39 @@
 #define HASNAN(field) (ANY(.NOT.ABS(field)<1e20))
 
+#define START_TRACE(id,nprimal,ndual,nedge) CALL enter_trace(id, 8*llm*((nprimal)*primal_num+(ndual)*dual_num+(nedge)*edge_num) )
+#define STOP_TRACE CALL exit_trace()
+
 !----------------------------- Non-Hydrostatic -----------------------------
 
-SUBROUTINE compute_NH_geopot(tau,dummy, m_ik, m_il, theta, W_il, Phi_il)
-  FIELD_MASS   :: m_ik, theta, p_ik, A_ik, C_ik   ! IN*2,LOCAL*3
-  FIELD_GEOPOT :: m_il, W_il, Phi_il, Phi_star_il, R_il, x_il, B_il, D_il  ! IN,INOUT*2, LOCAL*5 
-  DBL :: tau, dummy, gamma, rho_ij, X_ij, Y_ij, wil, tau2_g, g2, gm2, ml_g2, c2_mik
-  DECLARE_INDICES
+SUBROUTINE compute_NH_geopot(tau, m_ik, m_il, theta, W_il, Phi_il)
+  FIELD_MASS   :: m_ik, theta   ! IN*2
+  FIELD_GEOPOT :: m_il, W_il, Phi_il, Phi_star_il  ! IN,INOUT*2, LOCAL*5 
+  DBL :: tau, gamma, tau2_g, tau2_g2, g2, gm2, vreff, Rd_preff
   INTEGER :: iter
+  DECLARE_INDICES
+  DBL :: rho_ij, X_ij, Y_ij, wil, rho_c2_mik, c2_mik, ml_g2
+#define COLUMN 0
+#if COLUMN 
+  DOUBLE1(llm)  :: pk, Ak, Ck
+  DOUBLE1(llm+1):: Rl, Bl, Dl, xl
+#define p_ik(l,ij) pk(l)
+#define A_ik(l,ij) Ak(l)
+#define C_ik(l,ij) Ck(l)
+#define R_il(l,ij) Rl(l)
+#define B_il(l,ij) Bl(l)
+#define D_il(l,ij) Dl(l)
+#define x_il(l,ij) xl(l)
+#else
+  FIELD_MASS :: p_ik, A_ik, C_ik
+  FIELD_GEOPOT :: R_il, B_il, D_il, x_il
+#endif
+
+  START_TRACE(id_NH_geopot, 7,0,0)
 #include "../kernels_unst/compute_NH_geopot.k90"
+  STOP_TRACE  
+
+#if COLUMN
+#undef p_ik
+#undef A_ik
+#undef C_ik
+#undef R_il
+#undef B_il
+#undef D_il
+#undef x_il
+#endif
+#undef COLUMN
 END SUBROUTINE compute_NH_geopot
 
@@ -59 +91 @@
   DECLARE_EDGES
   DBL :: W_el, W2_el, gPhi2, dP, divG, u2, uu
+  START_TRACE(id_slow_NH, 5,0,3)
 #include "../kernels_unst/caldyn_slow_NH.k90"
+  STOP_TRACE
 END SUBROUTINE compute_caldyn_slow_NH
 
@@ -69 +103 @@
   FIELD_U      :: du                     ! OUT
   DECLARE_INDICES
-  DBL :: X_ij, rho_ij, T_ij, gamma, Cvd, vreff
+  DBL :: X_ij, rho_ij, T_ij, gamma, Cvd, vreff, Rd_preff
+#include "../kernels_unst/caldyn_mil.k90"
+  IF(tau>0) THEN ! solve implicit problem for geopotential
+    CALL compute_NH_geopot(tau, rhodz, m_il, theta, W, geopot)
+  END IF
+  START_TRACE(id_solver, 7,0,1)
 #include "../kernels_unst/caldyn_solver.k90"
+  STOP_TRACE
 END SUBROUTINE compute_caldyn_solver
 
@@ -79 +119 @@
   DECLARE_INDICES
   DBL :: w_ij, wflux_ij
+  START_TRACE(id_vert_NH, 6,0,1)
 #include "../kernels_unst/caldyn_vert_NH.k90"
+  STOP_TRACE
 END SUBROUTINE compute_caldyn_vert_NH
 
@@ -91 +133 @@
   DECLARE_INDICES
   DBL :: gdz, ke, uu, chi, gv, exner_ik, temp_ik, p_ik, qv, Rmix
+  START_TRACE(id_geopot, 3,0,3)
 #include "../kernels_unst/compute_geopot.k90"
+  STOP_TRACE
 END SUBROUTINE compute_geopot
 !
@@ -102 +146 @@
   LOGICAL, PARAMETER :: zero=.TRUE.
   DBL :: 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
 
@@ -118 +164 @@
   wwuu=0.
   !$OMP BARRIER
+  START_TRACE(id_vert, 5,0,3)
 #include "../kernels_unst/caldyn_wflux.k90"
 #include "../kernels_unst/caldyn_dmass.k90"
 #include "../kernels_unst/caldyn_vert.k90"
+  STOP_TRACE
 END SUBROUTINE caldyn_vert
 
@@ -130 +178 @@
   DECLARE_EDGES
   DBL :: divF, du_trisk
+  START_TRACE(id_coriolis, 3,4,0) ! primal, dual, edge
 #include "../kernels_unst/coriolis.k90"
+  STOP_TRACE
 END SUBROUTINE
 
@@ -139 +189 @@
   DECLARE_INDICES
   DBL :: m
+  START_TRACE(id_theta, 3,0,0) ! primal, dual, edge
 #include "../kernels_unst/theta.k90"
+  STOP_TRACE
 END SUBROUTINE
 
@@ -150 +202 @@
   DECLARE_VERTICES
   DBL :: etav, hv
+  START_TRACE(id_pvort_only, 1,1,2) ! primal, dual, edge
 #include "../kernels_unst/pvort_only.k90"
+  STOP_TRACE
 END SUBROUTINE compute_pvort_only
 
@@ -162 +216 @@
   DECLARE_EDGES
   DBL          :: due
-
+  START_TRACE(id_fast, 4,0,2) ! primal, dual, edge
 #include "../kernels_unst/caldyn_fast.k90"
-
+  STOP_TRACE
 END SUBROUTINE compute_caldyn_fast
 

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

@@ -44 +44 @@
   INTEGER(C_INT), BIND(C) :: comm_icosa
 
-  INTEGER, PARAMETER :: id_pvort_only=1, id_slow_hydro=2, id_fast=3, id_coriolis=4, id_theta=5, &
-       id_vert_NH=6, id_solver=7, id_slow_NH=8, id_NH_geopot=9, id_vert=10, id_NH_Phi_star=11, nb_routines=11
+  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, nb_routines=14 
   DBL, PRIVATE :: start_time, time_spent(nb_routines) ! time spent in each kernel
   INTEGER, PRIVATE :: current_id, nb_calls(nb_routines), bytes(nb_routines) ! bytes read or written be each kernel
   CHARACTER(len = 10) :: id_name(nb_routines) = &
-       (/'pvort_only', 'slow_hydro', 'fast      ', 'coriolis  ', 'theta     ', &
-       'vert_NH   ', 'solver    ', 'slow_NH   ', 'NH_geopot ', 'vert      ', &
-       'Phi_star  '/)
+       (/'dev1      ', 'dev2      ', &
+       'pvort_only', 'slow_hydro', 'fast      ', 'coriolis  ', 'theta     ', 'geopot    ', 'vert      ', &
+       'solver    ', 'slow_NH   ', 'NH_geopot ', 'vert_NH   ',  'update    ' /)
 
 CONTAINS

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

@@ -219 +219 @@
     !
     INTEGER :: l, ij
+    CALL enter_trace(id_update, 8*sz*(j+1) )
     !  PRINT *, clj(1:j,j)
     SELECT CASE(j)
@@ -263 +264 @@
        END DO
     END SELECT
+    CALL exit_trace()
   END SUBROUTINE update