Changeset 362 for codes/icosagcm/trunk/src/hevi_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/hevi_scheme.f90 (modified) (4 diffs)

codes/icosagcm/trunk/src/hevi_scheme.f90

@@ -1 +1 @@
 MODULE hevi_scheme_mod
-  USE euler_scheme_mod
   USE prec
   USE domain_mod
   USE field_mod
+  USE euler_scheme_mod
+  USE caldyn_kernels_base_mod, ONLY : DEC
   IMPLICIT NONE
   PRIVATE
@@ -53 +54 @@
     REAL(rstd),POINTER :: hflux(:,:),wflux(:,:),hfluxt(:,:),wfluxt(:,:)
 
+    IF(DEC) CALL legacy_to_DEC(f_ps, f_u)
     DO j=1,nb_stage
        CALL caldyn_hevi((j==1) .AND. (MOD(it,itau_out)==0), taujj(j), &
@@ -79 +81 @@
        END DO
     END DO
+    IF(DEC) CALL DEC_to_legacy(f_ps, f_u)
   END SUBROUTINE HEVI_scheme
   
@@ -87 +90 @@
     REAL(rstd), POINTER :: y(:,:), dy(:,:)
     INTEGER :: ind
-    DO ind=1,ndomain
-       IF (.NOT. assigned_domain(ind)) CYCLE
-       CALL swap_dimensions(ind)
-       dy=f_dy(ind); y=f_y(ind)
-       CALL compute_update(w,y,dy)
-    ENDDO
+    IF(w /= 0.) THEN
+       DO ind=1,ndomain
+          IF (.NOT. assigned_domain(ind)) CYCLE
+          CALL swap_dimensions(ind)
+          dy=f_dy(ind); y=f_y(ind)
+          CALL compute_update(w,y,dy)
+       ENDDO
+    END IF
   END SUBROUTINE update