Changeset 17 for codes/icosagcm/trunk/src/timeloop_gcm.f90

Timestamp:

07/16/12 10:24:35 (12 years ago)

Author:

ymipsl

Message:

Merge advection scheme from sarvesh in standard version

YM

File:

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

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -3 +3 @@
   USE transfert_mod
   USE etat0_mod
-  
-  INTEGER,PARAMETER :: euler=1, leapfrog=2, leapfrog_matsuno=3, adam_bashforth=4
   
 CONTAINS
@@ -18 +16 @@
   USE dissip_gcm_mod
   USE ioipsl
-  USE caldyn_gcm_mod
+  USE caldyn_mod
   USE theta2theta_rhodz_mod
   USE etat0_mod
+  USE guided_mod
+  USE advect_tracer_mod
+  
   IMPLICIT NONE
   TYPE(t_field),POINTER :: f_phis(:)
   TYPE(t_field),POINTER :: f_theta(:)
+  TYPE(t_field),POINTER :: f_q(:)
   TYPE(t_field),POINTER :: f_dtheta(:)
   TYPE(t_field),POINTER :: f_ps(:),f_psm1(:), f_psm2(:)
@@ -33 +35 @@
 
   REAL(rstd),POINTER :: phis(:)
+  REAL(rstd),POINTER :: q(:,:,:)
   REAL(rstd),POINTER :: ps(:) ,psm1(:), psm2(:)
   REAL(rstd),POINTER :: u(:,:) , um1(:,:), um2(:,:)
@@ -42 +45 @@
   INTEGER :: ind
   INTEGER :: it,i,j,n
-  INTEGER :: scheme
+  CHARACTER(len=255) :: scheme
   INTEGER :: matsuno_period
   INTEGER :: itaumax
-  
+  INTEGER :: write_period  
+  INTEGER :: itau_out
 
   dt=90.
@@ -52 +56 @@
   itaumax=100
   CALL getin('itaumax',itaumax)
-  
-  scheme=leapfrog_matsuno
+
+  write_period=0
+  CALL getin('write_period',write_period)
+  itau_out=INT(write_period/dt)
+  
+  scheme='adam_bashforth'
   CALL getin('scheme',scheme)
   
   matsuno_period=5
   CALL getin('matsuno_period',matsuno_period)
-  IF (scheme==leapfrog) matsuno_period=itaumax+1
+  IF (TRIM(scheme)=='leapfrog') matsuno_period=itaumax+1
 
   CALL allocate_field(f_phis,field_t,type_real)
@@ -79 +87 @@
   CALL allocate_field(f_dtheta,field_t,type_real,llm)
 
+  CALL allocate_field(f_q,field_t,type_real,llm,nqtot)
+
   CALL allocate_field(f_theta_rhodz,field_t,type_real,llm)
   CALL allocate_field(f_theta_rhodzm1,field_t,type_real,llm)
@@ -88 +98 @@
   CALL init_dissip(dt)
   CALL init_caldyn(dt)
-  
-!  CALL etat0_academic(f_ps,f_phis,f_theta_rhodz,f_u)
-  CALL etat0_jablonowsky06(f_ps,f_phis,f_theta_rhodz,f_u)
-!  CALL test_etat0_jablonowsky06
+  CALL init_guided(dt)
+  CALL init_advect_tracer(dt)
+  
+  CALL etat0(f_ps,f_phis,f_theta_rhodz,f_u, f_q)
   
   DO it=0,itaumax
     PRINT *,"It No :",It
 
+    CALL guided(it,f_ps,f_theta_rhodz,f_u,f_q)
     CALL caldyn(it,f_phis,f_ps,f_theta_rhodz,f_u, f_dps, f_dtheta_rhodz, f_du)
-
-    IF (scheme==Euler) THEN
-      CALL  euler_scheme
-    ELSE IF (scheme==leapfrog) THEN
-      CALL leapfrog_scheme
-    ELSE IF (scheme==leapfrog_matsuno) THEN
-      CALL  leapfrog_matsuno_scheme
-    ELSE IF (scheme==adam_bashforth) THEN
-      CALL dissip(f_u,f_du,f_ps,f_theta_rhodz,f_dtheta_rhodz)
-      CALL adam_bashforth_scheme
+    CALL advect_tracer(f_ps,f_u,f_q)
+    
+    SELECT CASE (TRIM(scheme))
+      CASE('euler')
+        CALL  euler_scheme
+
+      CASE ('leapfrog')
+        CALL leapfrog_scheme
+
+      CASE ('leapfrog_matsuno')
+        CALL  leapfrog_matsuno_scheme
+
+      CASE ('adam_bashforth')
+        CALL dissip(f_u,f_du,f_ps,f_theta_rhodz,f_dtheta_rhodz)
+        CALL adam_bashforth_scheme
+
+      CASE default
+        PRINT*,'Bad selector for variable scheme : <', TRIM(scheme),"> options are <euler>, <leapfrog>, <leapfrog_matsuno>, <adam_bashforth>" 
+        STOP
+        
+    END SELECT
+
+    
+    IF ( itau_out>0 .AND. MOD(it,itau_out)==0) THEN
+      CALL writefield("q",f_q)
+      CALL writefield("ps",f_ps)
     ENDIF