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

Timestamp:

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

Author:

dubos

Message:

Progress towards NH

File:

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

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -76 +76 @@
     CALL allocate_field(f_phis,field_t,type_real,name='phis')
     ! Model state at current time step
-    CALL allocate_field(f_geopot,field_t,type_real,llm+1,name='geopot')
     CALL allocate_field(f_ps,field_t,type_real, name='ps')
     CALL allocate_field(f_mass,field_t,type_real,llm,name='mass')
@@ -82 +81 @@
     CALL allocate_field(f_theta_rhodz,field_t,type_real,llm,name='theta_rhodz')
     CALL allocate_field(f_u,field_u,type_real,llm,name='u')
+    CALL allocate_field(f_geopot,field_t,type_real,llm+1,name='geopot')
+    CALL allocate_field(f_W,field_t,type_real,llm+1,name='W')
     CALL allocate_field(f_q,field_t,type_real,llm,nqtot,'q')
     ! Mass fluxes
@@ -108 +109 @@
        CALL allocate_fields(nb_stage,f_du_slow, field_u,type_real,llm,name='du_slow')
        CALL allocate_fields(nb_stage,f_du_fast, field_u,type_real,llm,name='du_fast')
+       CALL allocate_fields(nb_stage,f_dW_slow, field_t,type_real,llm+1,name='dW_slow')
+       CALL allocate_fields(nb_stage,f_dW_fast, field_t,type_real,llm+1,name='dW_fast')
+       CALL allocate_fields(nb_stage,f_dPhi_slow, field_t,type_real,llm+1,name='dPhi_slow')
+       CALL allocate_fields(nb_stage,f_dPhi_fast, field_t,type_real,llm+1,name='dPhi_fast')
        f_dps => f_dps_slow(:,1)
        f_du => f_du_slow(:,1)
@@ -131 +136 @@
     CALL init_check_conserve
 
-    CALL etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_q)
+    CALL etat0(f_ps,f_mass,f_phis,f_theta_rhodz,f_u, f_geopot,f_W, f_q)
 
     CALL transfert_request(f_phis,req_i0)