Changeset 562 for codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90

Timestamp:

09/28/17 21:58:12 (7 years ago)

Author:

dubos

Message:

devel : per-kernel activation of macro-generated code

File:

• codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90 (modified) (13 diffs)

codes/icosagcm/devel/src/dynamics/caldyn_kernels_hevi.F90

@@ -9 +9 @@
   PRIVATE
 
-  REAL(rstd), PARAMETER :: pbot=1e5, Phi_bot=0., rho_bot=1e6 ! FIXME
+  REAL(rstd), PARAMETER :: pbot=1e5, rho_bot=1e6
 
   LOGICAL, SAVE :: debug_hevi_solver = .FALSE.
-  LOGICAL, PARAMETER :: rigid=.TRUE.
 
   PUBLIC :: compute_theta, compute_pvort_only, compute_caldyn_Coriolis, &
@@ -62 +61 @@
     CALL trace_start("compute_pvort_only")  
 !!! Compute shallow-water potential vorticity
+    IF(dysl_pvort_only) THEN
 #ifdef CPP_DYSL
 #include "../kernels/pvort_only.k90"
 #else
+        STOP 'dysl_pvort_only=.TRUE. but DYNAMICO is compiled without the -dysl option'
+#endif
+    ELSE
+
     radius_m2=radius**(-2)
     DO l = ll_begin,ll_end
@@ -94 +98 @@
 
     ENDDO
-#endif
+   
+    END IF ! dysl
     CALL trace_end("compute_pvort_only")
 
   END SUBROUTINE compute_pvort_only
 
-  SUBROUTINE compute_NH_geopot(tau, m_ik, m_il, theta, W_il, Phi_il)
+  SUBROUTINE compute_NH_geopot(tau, phis, m_ik, m_il, theta, W_il, Phi_il)
     REAL(rstd),INTENT(IN)    :: tau ! solve Phi-tau*dPhi/dt = Phi_rhs
+    REAL(rstd),INTENT(IN)    :: phis(iim*jjm)
     REAL(rstd),INTENT(IN)    :: m_ik(iim*jjm,llm)
     REAL(rstd),INTENT(IN)    :: m_il(iim*jjm,llm+1)
@@ -125 +131 @@
 
 #ifdef CPP_DYSL
+#define PHI_BOT(ij) phis(ij)
 #include "../kernels/compute_NH_geopot.k90"
 #else
@@ -264 +271 @@
   END SUBROUTINE compute_NH_geopot
 
-  SUBROUTINE compute_caldyn_solver(tau,rhodz,theta,pk, geopot,W, m_il,pres, dPhi,dW,du)
+  SUBROUTINE compute_caldyn_solver(tau,phis, rhodz,theta,pk, geopot,W, m_il,pres, dPhi,dW,du)
     REAL(rstd),INTENT(IN) :: tau ! "solve" Phi-tau*dPhi/dt = Phi_rhs
+    REAL(rstd),INTENT(IN)    :: phis(iim*jjm)
     REAL(rstd),INTENT(IN)    :: rhodz(iim*jjm,llm)
     REAL(rstd),INTENT(IN)    :: theta(iim*jjm,llm,nqdyn)
@@ -287 +295 @@
 #ifdef CPP_DYSL
 !$OMP BARRIER
+#define PHI_BOT(ij) phis(ij)
+#define PHI_BOT_VAR phis
 #include "../kernels/caldyn_solver.k90"
 !$OMP BARRIER
@@ -396 +406 @@
     Rd=cpp*kappa
 
+    IF(dysl_caldyn_fast) THEN
 #ifdef CPP_DYSL
 #include "../kernels/caldyn_fast.k90"
 #else
+    STOP 'dysl_caldyn_fast=.TRUE. but DYNAMICO is compiled without the -dysl option'
+#endif
+    ELSE
+
     ! Compute Bernoulli term
     IF(boussinesq) THEN
@@ -496 +511 @@
        END IF
     END DO
-#endif       
+
+    END IF ! dysl
     CALL trace_end("compute_caldyn_fast")
 
@@ -515 +531 @@
     CALL trace_start("compute_caldyn_Coriolis")
 
+    IF(dysl_caldyn_coriolis) THEN
 #ifdef CPP_DYSL
 #include "../kernels/coriolis.k90"
 #else
+    STOP 'dysl_caldyn_coriolis is .TRUE. but DYNAMICO is compiled without the -dysl option'
+#endif
+
+    ELSE
 #define FTHETA(ij) Ftheta(ij,1)
 
@@ -653 +674 @@
     END SELECT
 #undef FTHETA
-#endif
+
+    END IF ! dysl
 
     CALL trace_end("compute_caldyn_Coriolis")
@@ -672 +694 @@
     CALL trace_start("compute_caldyn_slow_hydro")
 
+    IF(dysl_slow_hydro) THEN
 #ifdef CPP_DYSL
 #define BERNI(ij,l) berni(ij,l)
@@ -677 +700 @@
 #undef BERNI
 #else
+        STOP 'dysl_slow_hydro=.TRUE. but DYNAMICO is compiled without the -dysl option'
+#endif
+
+     ELSE
+
 #define BERNI(ij) berni(ij,1)
 
@@ -726 +754 @@
     END DO
 #undef BERNI
-#endif
+    END IF ! dysl
     CALL trace_end("compute_caldyn_slow_hydro")    
   END SUBROUTINE compute_caldyn_slow_hydro