Changeset 366 for codes/icosagcm/trunk/src/hevi_scheme.f90

Timestamp:

10/30/15 15:41:06 (9 years ago)

Author:

dubos

Message:

Progress towards NH

File:

• codes/icosagcm/trunk/src/hevi_scheme.f90 (modified) (3 diffs)

codes/icosagcm/trunk/src/hevi_scheme.f90

@@ -28 +28 @@
   SUBROUTINE set_coefs_ark33(dt)
     ! Fully-explicit RK3 scheme disguised as ARK
-    ! To check correctness of caldyn_hevi
     REAL(rstd) :: dt
-    REAL(rstd), PARAMETER, DIMENSION(3,4) :: &
-         ajl=(/ zero, (/.5,0.,0./), (/-1.,2.,0./), (/1./6.,2./3.,1./6./) /)
-    CALL set_coefs_hevi(dt, ajl, ajl)
+    CALL set_coefs_rk(dt, (/ zero, (/.5,0.,0./), (/-1.,2.,0./), (/1./6.,2./3.,1./6./) /) )
   END SUBROUTINE set_coefs_ark33
     
+  SUBROUTINE set_coefs_rk(dt, ajl)
+    REAL(rstd) :: dt, ajl(3,4)
+    CALL set_coefs_hevi(dt,ajl,ajl)
+  END SUBROUTINE set_coefs_rk
+
   SUBROUTINE set_coefs_hevi(dt, ajl_slow, ajl_fast)
     REAL(rstd) :: dt, ajl_slow(3,4), ajl_fast(3,4) ! fast/slow Butcher tableaus
@@ -58 +60 @@
        CALL caldyn_hevi((j==1) .AND. (MOD(it,itau_out)==0), taujj(j), &
             f_phis, f_ps,f_mass,f_theta_rhodz,f_u,f_q, &
-            f_geopot, f_hflux, f_wflux, &
+            f_W, f_geopot, f_hflux, f_wflux, &
             f_dps_slow(:,j), f_dmass_slow(:,j), f_dtheta_rhodz_slow(:,j), &
-            f_du_slow(:,j), f_du_fast(:,j) )
+            f_du_slow(:,j), f_du_fast(:,j), &
+            f_dPhi_slow(:,j), f_dPhi_fast(:,j), &
+            f_dW_slow(:,j), f_dW_fast(:,j) )
        ! accumulate mass fluxes for transport scheme
        DO ind=1,ndomain
@@ -79 +83 @@
           CALL update(bjl(l,j), f_u, f_du_slow(:,l))
           CALL update(cjl(l,j), f_u, f_du_fast(:,l))
+          IF(.NOT. hydrostatic) THEN
+ !            CALL update(bjl(l,j), f_W, f_dW_slow(:,l)) ! slow tendencies of w, Phi not implemented yet
+             CALL update(cjl(l,j), f_W, f_dW_fast(:,l))
+ !            CALL update(bjl(l,j), f_geopot, f_dPhi_slow(:,l))
+             CALL update(cjl(l,j), f_geopot, f_dPhi_fast(:,l))
+          END IF
        END DO
     END DO