Changeset 950 for codes/icosagcm/devel/src/time/hevi_scheme.f90

Timestamp:

07/14/19 14:40:34 (5 years ago)

Author:

dubos

Message:

devel/unstructured : towards Fortran driver for DYNAMICO-unstructured

File:

• codes/icosagcm/devel/src/time/hevi_scheme.f90 (modified) (5 diffs)

codes/icosagcm/devel/src/time/hevi_scheme.f90

@@ -11 +11 @@
   REAL(rstd), PARAMETER, DIMENSION(3) :: zero = (/0.,0.,0./)
 
-  PUBLIC :: set_coefs_ark23, set_coefs_ark33, hevi_scheme
+  PUBLIC :: set_coefs_ark23, set_coefs_ark33, set_coefs_ark11, hevi_scheme
 
 CONTAINS
@@ -34 +34 @@
   END SUBROUTINE set_coefs_ark33
     
+  SUBROUTINE set_coefs_ark11(dt)
+    ! Euler scheme disguised as ARK for development purposes
+    REAL(rstd) :: dt
+    CALL set_coefs_rk(dt, (/ zero, (/1.,0.,0./), (/0.,0.,0./), (/0./0.,0./0.,0./) /) )
+  END SUBROUTINE set_coefs_ark11
+    
   SUBROUTINE set_coefs_rk(dt, ajl)
     REAL(rstd) :: dt, ajl(3,4)
@@ -42 +48 @@
     REAL(rstd) :: dt, ajl_slow(3,4), ajl_fast(3,4) ! fast/slow Butcher tableaus
     INTEGER :: j
-    DO j=1,3
+    DO j=1,nb_stage
        bjl(:,j) = dt*(ajl_slow(:,j+1)-ajl_slow(:,j))
        cjl(:,j) = dt*(ajl_fast(:,j+1)-ajl_fast(:,j))
        taujj(j) = dt*ajl_fast(j,j)
     END DO
-    wj=dt*ajl_slow(:,4)
+    wj=dt*ajl_slow(:,nb_stage+1)
   END SUBROUTINE set_coefs_hevi
 
@@ -142 +148 @@
     INTENT(INOUT) :: y
     INTENT(IN) :: dy
-    INTEGER :: l
-    DO l=ll_begin,ll_end
+    INTEGER :: l, l_begin, l_end
+    IF(grid_type==grid_ico) THEN
+       l_begin = ll_begin
+       l_end   = l_end
+    ELSE ! unstructured : FIXME OpenMP
+       l_begin = 1
+       l_end   = SIZE(y,2)
+    END IF
+    DO l=l_begin,l_end
        y(:,l)=y(:,l)+w*dy(:,l)
     ENDDO
@@ -157 +170 @@
        IF (.NOT. assigned_domain(ind)) CYCLE
        dy=f_dy(ind); y=f_y(ind)
-       IF (is_omp_level_master) CALL compute_update_2D(w,y,dy)
+       IF (is_omp_level_master) CALL compute_update_2D(w,y,dy) ! FIXME OpenMP+unstructured
     ENDDO
   END SUBROUTINE update_2D