Changeset 858 for codes/icosagcm/devel/Python/src/kernels_caldyn_hevi.jin

Timestamp:

05/06/19 16:53:07 (5 years ago)

Author:

dubos

Message:

devel : moved DYSL into compute_caldyn_fast.F90

File:

• codes/icosagcm/devel/Python/src/kernels_caldyn_hevi.jin (modified) (1 diff)

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

@@ -127 +127 @@
 END_BLOCK
 
-KERNEL(caldyn_fast)
-!
-  SELECT CASE(caldyn_thermo)
-  CASE(thermo_boussinesq)
-    FORALL_CELLS()
-      ON_PRIMAL
-        berni(CELL) = pk(CELL)
-        ! from now on pk contains the vertically-averaged geopotential
-        pk(CELL) = .5*(geopot(CELL)+geopot(UP(CELL)))
-      END_BLOCK
-    END_BLOCK
-  CASE(thermo_theta)
-    FORALL_CELLS()
-      ON_PRIMAL
-        berni(CELL) = .5*(geopot(CELL)+geopot(UP(CELL)))
-      END_BLOCK
-    END_BLOCK
-  CASE(thermo_entropy)
-    FORALL_CELLS()
-      ON_PRIMAL
-        berni(CELL) = .5*(geopot(CELL)+geopot(UP(CELL)))
-        berni(CELL) = berni(CELL) + pk(CELL)*(cpp-theta(CELL,1)) ! Gibbs = Cp.T-Ts = T(Cp-s)
-      END_BLOCK
-    END_BLOCK
-  CASE(thermo_variable_Cp)
-    ! thermodynamics with variable Cp
-    !           Cp(T) = Cp0 * (T/T0)^nu
-    ! =>            h = Cp(T).T/(nu+1)
-
-    FORALL_CELLS()
-      ON_PRIMAL
-        berni(CELL) = .5*(geopot(CELL)+geopot(UP(CELL)))
-        cp_ik = cpp*(pk(CELL)/Treff)**nu
-        berni(CELL) = berni(CELL) + pk(CELL)*(cp_ik/(nu+1.)-theta(CELL,1)) ! Gibbs = h-Ts = T(Cp/(nu+1)-s)
-      END_BLOCK
-    END_BLOCK
-  CASE DEFAULT
-    PRINT *, 'Unsupported value of caldyn_thermo : ',caldyn_thermo  ! FIXME
-    STOP
-  END SELECT
-!
-  FORALL_CELLS()
-    ON_EDGES
-      due = .5*(theta(CELL1,1)+theta(CELL2,1))*(pk(CELL2)-pk(CELL1)) + berni(CELL2)-berni(CELL1)
-      du(EDGE) = du(EDGE) - SIGN*due
-      u(EDGE) = u(EDGE) + tau*du(EDGE)
-    END_BLOCK
-  END_BLOCK  
-!
-END_BLOCK
-
 KERNEL(coriolis)
 !