Changeset 624 for codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90

Timestamp:

12/08/17 15:08:49 (6 years ago)

Author:

dubos

Message:

devel : introduced kernels for caldyn_vert (optional)

File:

• codes/icosagcm/devel/src/unstructured/caldyn_unstructured.F90 (modified) (6 diffs)

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

@@ -2 +2 @@
   USE ISO_C_BINDING
   USE OMP_LIB
+#ifdef CPP_USING_XIOS
   USE xios
+#endif
   IMPLICIT NONE
   PRIVATE
   SAVE
 
-#define BINDC(thename) BIND(C, name='dynamico_' // #thename)
+#define BINDC_(thename) BIND(C, name=#thename)
+#define BINDC(thename) BINDC_(dynamico_ ## thename)
 !
 #define DBL REAL(C_DOUBLE)
@@ -15 +18 @@
 #define INDEX INTEGER(C_INT)
 #define PHI_BOT(ij) Phi_bot
-#define PHI_BOT_VAR 0.d0
-!
-  INTEGER, PARAMETER :: eta_mass=1, eta_lag=2, thermo_theta=1, thermo_entropy=2, thermo_moist=3, thermo_boussinesq=4
-  INTEGER(C_INT),  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, nb_threads=1
+#define PHI_BOT_VAR 0.
+!
+  INTEGER, PARAMETER :: eta_mass=1, eta_lag=2, &
+       thermo_theta=1, thermo_entropy=2, thermo_moist=3, thermo_boussinesq=4, &
+       caldyn_vert_cons=1
+  INTEGER(C_INT),  BIND(C) :: caldyn_thermo=thermo_theta, caldyn_eta=eta_lag, &
+       caldyn_vert_variant=caldyn_vert_cons, nb_threads=1
   LOGICAL(C_BOOL), BIND(C) :: hydrostatic=.TRUE., debug_hevi_solver=.TRUE., rigid=.TRUE.
 !
@@ -40 +46 @@
 !
   INTEGER(C_INT), BIND(C) :: comm_icosa
+
+#ifdef CPP_USING_XIOS
   TYPE(xios_context) :: ctx_hdl
+#endif
 
 CONTAINS
@@ -199 +208 @@
   DOUBLE2(llm+1, edge_num) :: wwuu
   DECLARE_INDICES
+  DBL :: dF_deta, dFu_deta
   wwuu=0.
+#include "../kernels_unst/caldyn_wflux.k90"
+#include "../kernels_unst/caldyn_dmass.k90"
 #include "../kernels_unst/caldyn_vert.k90"
 END SUBROUTINE caldyn_vert
@@ -392 +404 @@
 !---------------------------------------------- XIOS -----------------------------------------
 
+#ifdef CPP_USING_XIOS
+
   SUBROUTINE setup_xios() BINDC(setup_xios)
     ! MPI_INIT / MPI_finalize are assumed to be called BEFORE/AFTER this routine
@@ -443 +457 @@
   END SUBROUTINE call_xios_update_calendar
 
+#endif
+
 END MODULE caldyn_unstructured_mod