Changeset 950 for codes/icosagcm/devel/src/time/euler_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/euler_scheme.f90 (modified) (4 diffs)

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

@@ -15 +15 @@
        f_dW_slow(:,:), f_dW_fast(:,:)                                 ! vertical momentum tendencies (NH)
 
-  INTEGER, PARAMETER, PUBLIC :: explicit=1, hevi=2, euler=1, rk4=2, mlf=3, rk25=4, ark23=6, ark33=7
+  INTEGER, PARAMETER, PUBLIC :: explicit=1, hevi=2, euler=1, rk4=2, mlf=3, rk25=4, ark23=6, ark33=7, ark11=8
 
   INTEGER,SAVE, PUBLIC :: nb_stage, matsuno_period, scheme, scheme_family
@@ -160 +160 @@
        IF(caldyn_eta==eta_mass .AND. is_omp_first_level) THEN ! update ps
           ps=f_ps(ind)
-          ps(:)=(ps(:)-ptop)/g
+          ps(:)=(ps(:)-ptop)/g ! FIXME : OpenMP+unstructured
        END IF
 
@@ -175 +175 @@
           ENDDO
        CASE(grid_unst)
-          PRINT *, 'legacy_to_DEC', llm, edge_num, SHAPE(u), SHAPE(de) ! FIXME
+!          PRINT *, 'legacy_to_DEC', llm, edge_num, SHAPE(u), SHAPE(de) ! FIXME
           DO ij=1, edge_num
              DO l=1,llm
@@ -206 +206 @@
        IF(caldyn_eta==eta_mass .AND. is_omp_first_level) THEN
           ps=f_ps(ind)
-          !DIR$ SIMD
-          DO ij=ij_begin,ij_end
-             ps(ij)=ptop+ps(ij)*g ! convert column-integrated mass to ps
-          ENDDO
+          ps(:) = ptop + ps(:)*g ! FIXME : OpenMP+unstructured
        ENDIF
        
        u=f_u(ind)
-       DO l=ll_begin,ll_end
-          !DIR$ SIMD
-          DO ij=ij_begin,ij_end
-             u(ij+u_right,l)=u(ij+u_right,l)/de(ij+u_right)
-             u(ij+u_lup,l)=u(ij+u_lup,l)/de(ij+u_lup)
-             u(ij+u_ldown,l)=u(ij+u_ldown,l)/de(ij+u_ldown)
-          ENDDO
-       ENDDO
+       SELECT CASE(grid_type)
+       CASE(grid_ico)
+          DO l=ll_begin,ll_end
+             !DIR$ SIMD
+             DO ij=ij_begin,ij_end
+                u(ij+u_right,l)=u(ij+u_right,l)/de(ij+u_right)
+                u(ij+u_lup,l)=u(ij+u_lup,l)/de(ij+u_lup)
+                u(ij+u_ldown,l)=u(ij+u_ldown,l)/de(ij+u_ldown)
+             ENDDO
+          ENDDO
+       CASE(grid_unst)
+!          PRINT *, 'DEC_to_legacy', llm, edge_num, SHAPE(u), SHAPE(de) ! FIXME
+          DO ij=1, edge_num
+             DO l=1,llm
+                u(l,ij) = u(l,ij)/de(ij)
+             END DO
+          END DO
+       CASE DEFAULT
+          STOP 'Unsupported grid_type encountered in legacy_to_DEC'
+       END SELECT
     ENDDO