Changeset 158

Timestamp:

06/04/13 12:28:01 (11 years ago)

Author:

dubos

Message:

removed LeapFrog? & Adams-Bashforth from timeloop_gcm

File:

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

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -243 +243 @@
        CASE (mlf)
           CALL  leapfrog_matsuno_scheme(stage)
-          
-          !      CASE ('leapfrog')
-          !        CALL leapfrog_scheme
-          !
-          !      CASE ('adam_bashforth')
-          !        CALL dissip(f_u,f_du,f_ps,f_phis, f_theta_rhodz,f_dtheta_rhodz)
-          !        CALL adam_bashforth_scheme
        CASE DEFAULT
           STOP
@@ -432 +425 @@
     END SUBROUTINE RK_scheme
 
-    SUBROUTINE leapfrog_scheme
-    IMPLICIT NONE
-      INTEGER :: ind
-
-      CALL trace_start("leapfrog_scheme")
-        
-      DO ind=1,ndomain
-        CALL swap_dimensions(ind)
-        CALL swap_geometry(ind)
-        ps=f_ps(ind)   ; u=f_u(ind)   ; theta_rhodz=f_theta_rhodz(ind)
-        psm1=f_psm1(ind) ; um1=f_um1(ind) ; theta_rhodzm1=f_theta_rhodzm1(ind)
-        psm2=f_psm2(ind) ; um2=f_um2(ind) ; theta_rhodzm2=f_theta_rhodzm2(ind)
-        dps=f_dps(ind) ; du=f_du(ind) ; dtheta_rhodz=f_dtheta_rhodz(ind)
-
-        IF (it==0) THEN
-          psm2(:)=ps(:) ; theta_rhodzm2(:,:)=theta_rhodz(:,:) ; um2(:,:)=u(:,:) 
-
-          ps(:)=ps(:)+dt*dps(:)
-          u(:,:)=u(:,:)+dt*du(:,:)
-          theta_rhodz(:,:)=theta_rhodz(:,:)+dt*dtheta_rhodz(:,:)
-
-          psm1(:)=ps(:) ; theta_rhodzm1(:,:)=theta_rhodz(:,:) ; um1(:,:)=u(:,:) 
-        ELSE
-        
-          ps(:)=psm2(:)+2*dt*dps(:)
-          u(:,:)=um2(:,:)+2*dt*du(:,:)
-          theta_rhodz(:,:)=theta_rhodzm2(:,:)+2*dt*dtheta_rhodz(:,:)
-
-          psm2(:)=psm1(:) ; theta_rhodzm2(:,:)=theta_rhodzm1(:,:) ; um2(:,:)=um1(:,:) 
-          psm1(:)=ps(:) ; theta_rhodzm1(:,:)=theta_rhodz(:,:) ; um1(:,:)=u(:,:) 
-        ENDIF
-          
-      ENDDO
-
-      CALL trace_end("leapfrog_scheme")
-
-    END SUBROUTINE leapfrog_scheme  
- 
     SUBROUTINE leapfrog_matsuno_scheme(stage)
     IMPLICIT NONE
@@ -519 +474 @@
     END SUBROUTINE leapfrog_matsuno_scheme  
          
-    SUBROUTINE adam_bashforth_scheme
-    IMPLICIT NONE
-      INTEGER :: ind
-
-      CALL trace_start("adam_bashforth_scheme")
-
-      DO ind=1,ndomain
-        CALL swap_dimensions(ind)
-        CALL swap_geometry(ind)
-        ps=f_ps(ind)   ; u=f_u(ind)   ; theta_rhodz=f_theta_rhodz(ind)
-        dps=f_dps(ind) ; du=f_du(ind) ; dtheta_rhodz=f_dtheta_rhodz(ind)
-        dpsm1=f_dpsm1(ind) ; dum1=f_dum1(ind) ; dtheta_rhodzm1=f_dtheta_rhodzm1(ind)
-        dpsm2=f_dpsm2(ind) ; dum2=f_dum2(ind) ; dtheta_rhodzm2=f_dtheta_rhodzm2(ind)
-
-        IF (it==0) THEN
-          dpsm1(:)=dps(:) ; dum1(:,:)=du(:,:) ; dtheta_rhodzm1(:,:)=dtheta_rhodz(:,:)
-          dpsm2(:)=dpsm1(:) ; dum2(:,:)=dum1(:,:) ; dtheta_rhodzm2(:,:)=dtheta_rhodzm1(:,:)
-        ENDIF
-              
-        ps(:)=ps(:)+dt*(23*dps(:)-16*dpsm1(:)+5*dpsm2(:))/12
-        u(:,:)=u(:,:)+dt*(23*du(:,:)-16*dum1(:,:)+5*dum2(:,:))/12
-        theta_rhodz(:,:)=theta_rhodz(:,:)+dt*(23*dtheta_rhodz(:,:)-16*dtheta_rhodzm1(:,:)+5*dtheta_rhodzm2(:,:))/12
-
-        dpsm2(:)=dpsm1(:) ; dum2(:,:)=dum1(:,:) ; dtheta_rhodzm2(:,:)=dtheta_rhodzm1(:,:)
-        dpsm1(:)=dps(:) ; dum1(:,:)=du(:,:) ; dtheta_rhodzm1(:,:)=dtheta_rhodz(:,:)
-
-      ENDDO     
-
-      CALL trace_end("adam_bashforth_scheme")
-      
-    END SUBROUTINE adam_bashforth_scheme
-
   END SUBROUTINE timeloop