Changeset 362 for codes/icosagcm/trunk/src/euler_scheme.f90

Timestamp:

09/25/15 14:36:36 (9 years ago)

Author:

dubos

Message:

Introduced DEC convention for velocity - HEVI only - cleanup to follow

File:

• codes/icosagcm/trunk/src/euler_scheme.f90 (modified) (2 diffs)

codes/icosagcm/trunk/src/euler_scheme.f90

@@ -19 +19 @@
   !$OMP THREADPRIVATE(nb_stage, matsuno_period, scheme, scheme_family)
 
-
-  PUBLIC :: euler_scheme, accumulate_fluxes
+  PUBLIC :: euler_scheme, accumulate_fluxes, legacy_to_DEC, DEC_to_legacy
 CONTAINS
 
@@ -143 +142 @@
   END SUBROUTINE accumulate_fluxes
 
+  SUBROUTINE legacy_to_DEC(f_ps, f_u)
+    USE icosa
+    USE disvert_mod
+    USE omp_para
+    USE trace
+    TYPE(t_field),POINTER :: f_ps(:), f_u(:)
+    REAL(rstd), POINTER :: ps(:), u(:,:)
+    INTEGER :: ind,ij,l
+    CALL trace_start("legacy_to_DEC")
+
+    DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
+       CALL swap_dimensions(ind)
+       CALL swap_geometry(ind)
+
+       IF(caldyn_eta==eta_mass .AND. is_omp_first_level) THEN ! update ps
+          ps=f_ps(ind)
+          !$SIMD
+          DO ij=ij_begin,ij_end
+             ps(ij)=(ps(ij)-ptop)/g ! convert ps to column-integrated mass
+          ENDDO
+       END IF
+
+       u=f_u(ind)
+       DO l=ll_begin,ll_end
+          !$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
+    ENDDO
+
+    CALL trace_end("legacy_to_DEC")  
+  END SUBROUTINE Legacy_to_DEC
+
+  SUBROUTINE DEC_to_legacy(f_ps, f_u)
+    USE icosa
+    USE disvert_mod
+    USE omp_para
+    USE trace
+    TYPE(t_field),POINTER :: f_ps(:), f_u(:)
+    REAL(rstd), POINTER :: ps(:), u(:,:)
+    INTEGER :: ind,ij,l
+    CALL trace_start("legacy_to_DEC")
+
+    DO ind=1,ndomain
+       IF (.NOT. assigned_domain(ind)) CYCLE
+       CALL swap_dimensions(ind)
+       CALL swap_geometry(ind)
+
+       IF(caldyn_eta==eta_mass .AND. is_omp_first_level) THEN
+          ps=f_ps(ind)
+          !$SIMD
+          DO ij=ij_begin,ij_end
+             ps(ij)=ptop+ps(ij)*g ! convert column-integrated mass to ps
+          ENDDO
+       ENDIF
+       
+       u=f_u(ind)
+       DO l=ll_begin,ll_end
+          !$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
+    ENDDO
+
+    CALL trace_end("DEC_to_legacy")  
+  END SUBROUTINE DEC_to_legacy
+
 END MODULE euler_scheme_mod