Changeset 3853

Timestamp:

Aug 1, 2015, 3:44:52 PM (10 years ago)

Author:

dubos

Message:

Sync with DYNAMICO@339 - Kinnmark RK scheme

File:

• dynamico_lmdz/aquaplanet/ICOSAGCM/src/timeloop_gcm.f90 (modified) (4 diffs)

dynamico_lmdz/aquaplanet/ICOSAGCM/src/timeloop_gcm.f90

@@ -6 +6 @@
   PUBLIC :: init_timeloop, timeloop
 
-  INTEGER, PARAMETER :: euler=1, rk4=2, mlf=3
+  INTEGER, PARAMETER :: euler=1, rk4=2, mlf=3, rk25=4
   INTEGER, PARAMETER :: itau_sync=10
+  REAL(rstd), DIMENSION(4), PARAMETER :: coef_rk4 = (/ .25, 1./3., .5, 1. /)
+  REAL(rstd), DIMENSION(5), PARAMETER :: coef_rk25 = (/ .25, 1./6., 3./8., .5, 1. /)
 
   TYPE(t_message),SAVE :: req_ps0, req_mass0, req_theta_rhodz0, req_u0, req_q0
@@ -95 +97 @@
         scheme=rk4
         nb_stage=4
+      CASE ('RK2.5')
+        scheme=rk25
+        nb_stage=5
       CASE ('leapfrog_matsuno')
         scheme=mlf
@@ -254 +259 @@
           CALL euler_scheme(.TRUE.)
        CASE (rk4)
-          CALL rk_scheme(stage)
+          CALL rk_scheme(stage, coef_rk4)
+       CASE (rk25)
+          CALL rk_scheme(stage, coef_rk25)
        CASE (mlf)
           CALL  leapfrog_matsuno_scheme(stage)
@@ -394 +401 @@
     END SUBROUTINE Euler_scheme
 
-    SUBROUTINE RK_scheme(stage)
+    SUBROUTINE RK_scheme(stage,coef)
       IMPLICIT NONE
       INTEGER :: ind, stage
-      REAL(rstd), DIMENSION(4), PARAMETER :: coef = (/ .25, 1./3., .5, 1. /)
+      REAL(rstd), INTENT(IN) :: coef(:)
       REAL(rstd) :: tau
       INTEGER :: i,j,ij,l