Changeset 688 for codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90

Timestamp:

04/09/18 15:22:10 (6 years ago)

Author:

dubos

Message:

devel/unstructured : select double or single precision for physical quantities

File:

• codes/icosagcm/devel/src/unstructured/timestep_unstructured.F90 (modified) (7 diffs)

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

@@ -11 +11 @@
   SAVE
 
-#define BINDC_(thename) BIND(C, name=#thename)
-#define BINDC(thename) BINDC_(dynamico_ ## thename)
-
-#define DBL REAL(C_DOUBLE)
-#define DOUBLE1(m) DBL, DIMENSION(m)
-#define DOUBLE2(m,n) DBL, DIMENSION(m,n)
-#define DOUBLE3(m,n,p) DBL, DIMENSION(m,n,p)
-#define DOUBLE4(m,n,p,q) DBL, DIMENSION(m,n,p,q)
-#define INDEX INTEGER(C_INT)
-
 #ifdef CPP_USING_XIOS
   TYPE(xios_context) :: ctx_hdl
@@ -27 +17 @@
 CONTAINS
 
-#define FIELD_PS      DOUBLE1(primal_num)
-#define FIELD_MASS    DOUBLE2(llm, primal_num)
-#define FIELD_Z       DOUBLE2(llm, dual_num)
-#define FIELD_U       DOUBLE2(llm, edge_num)
-#define FIELD_UL      DOUBLE2(llm+1, edge_num)
-#define FIELD_THETA   DOUBLE3(llm, primal_num, nqdyn)
-#define FIELD_GEOPOT  DOUBLE2(llm+1, primal_num)
+#include "unstructured.h90"
 
 #define HASNAN(field) (ANY(.NOT.ABS(field)<1e20))
@@ -41 +25 @@
                                  dmass_col,drhodz,dtheta_rhodz,du_fast,du_slow, &
                                  dPhi_fast, dPhi_slow, dW_fast, dW_slow) BINDC(caldyn_unstructured) ! OUT : tendencies
-    DBL, VALUE :: tau
+    NUM, VALUE :: tau
     FIELD_MASS   :: rhodz, drhodz, pk, berni          ! IN, OUT, DIAG
     FIELD_THETA  :: theta_rhodz, dtheta_rhodz, theta  ! IN, OUT, DIAG
@@ -54 +38 @@
     FIELD_UL     :: bufu1, bufu2, bufu3,bufu4
 
-    DBL          :: time1,time2
+    TIME          :: time1,time2
     INTEGER :: ij
     
@@ -124 +108 @@
     FIELD_GEOPOT :: geopot, w, wflux                 ! IN, INOUT, DIAG
     FIELD_Z      :: qv                               ! DIAG
-    DOUBLE2(       primal_num, max_nb_stage) :: dmass_col    ! OUT
-    DOUBLE3(llm,   primal_num, max_nb_stage) :: drhodz   ! OUT
-    DOUBLE4(llm,   primal_num, nqdyn, max_nb_stage) :: dtheta_rhodz ! OUT
-    DOUBLE3(llm,   edge_num,   max_nb_stage) :: du_fast,du_slow ! OUT
-    DOUBLE3(llm+1, primal_num, max_nb_stage) :: &
+    NUM2(       primal_num, max_nb_stage) :: dmass_col    ! OUT
+    NUM3(llm,   primal_num, max_nb_stage) :: drhodz   ! OUT
+    NUM4(llm,   primal_num, nqdyn, max_nb_stage) :: dtheta_rhodz ! OUT
+    NUM3(llm,   edge_num,   max_nb_stage) :: du_fast,du_slow ! OUT
+    NUM3(llm+1, primal_num, max_nb_stage) :: &
          dPhi_fast, dPhi_slow, dW_fast, dW_slow      ! OUT
     ! buffers for fields that need to be shared among OpenMP threads
@@ -134 +118 @@
     FIELD_GEOPOT :: bufm1, bufm2, bufm3
     FIELD_UL     :: bufu1, bufu2, bufu3,bufu4
-    DBL       :: time1,time2
+    TIME       :: time1,time2
     INTEGER :: step, stage, iq, ij
     
@@ -240 +224 @@
   SUBROUTINE update(j,sz,clj,field,dfield)
     INTEGER :: j, sz ! stage in ARK scheme, field size
-    DOUBLE2(max_nb_stage,max_nb_stage) :: clj ! modified Butcher tableau
-    DOUBLE1(sz) :: field
-    DOUBLE2(sz, max_nb_stage) :: dfield
+    NUM2(max_nb_stage,max_nb_stage) :: clj ! modified Butcher tableau
+    NUM1(sz) :: field
+    NUM2(sz, max_nb_stage) :: dfield
     !
     INTEGER :: l, ij