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

Timestamp:

09/09/15 15:26:13 (9 years ago)

Author:

dubos

Message:

ARK2.3 HEVI time stepping - tested with DCMIP4 only

File:

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

codes/icosagcm/trunk/src/hevi_scheme.f90

@@ -48 +48 @@
     USE time_mod
     USE disvert_mod
-    USE caldyn_mod
+    USE caldyn_hevi_mod
     LOGICAL :: fluxt_zero(ndomain) ! set to .TRUE. to start accumulating fluxes in time
     INTEGER :: it,j,l, ind
@@ -54 +54 @@
 
     DO j=1,nb_stage
-       !       CALL caldyn_hevi((j==1) .AND. (MOD(it,itau_out)==0), &
-       !            taujj(j), f_phis, f_geopot, &
-       !            f_ps,f_mass,f_theta_rhodz,f_u, &
-       !            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) )
-
-       CALL caldyn((j==1) .AND. (MOD(it,itau_out)==0), &
+       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_dps_slow(:,j), f_dmass_slow(:,j), f_dtheta_rhodz_slow(:,j), &
-            f_du_slow(:,j))
-
-       ! cumulate mass fluxes for transport scheme
+            f_du_slow(:,j), f_du_fast(:,j) )
+       ! accumulate mass fluxes for transport scheme
        DO ind=1,ndomain
           IF (.NOT. assigned_domain(ind)) CYCLE
@@ -75 +67 @@
           CALL accumulate_fluxes(hflux,wflux, hfluxt,wfluxt, wj(j), fluxt_zero(ind))
        END DO
-
        ! update model state
        DO l=1,j
@@ -85 +76 @@
           CALL update(bjl(l,j), f_theta_rhodz, f_dtheta_rhodz_slow(:,l))
           CALL update(bjl(l,j), f_u, f_du_slow(:,l))
-!          CALL update(cjl(l,j), f_u, f_du_fast(:,l)) ! FIXME - only slow terms right now
+          CALL update(cjl(l,j), f_u, f_du_fast(:,l))
        END DO
     END DO