Changeset 15 for codes/icosagcm/trunk/src/caldyn_gcm.f90

Timestamp:

07/09/12 15:23:38 (12 years ago)

Author:

ymipsl

Message:

Update on 3D dynamic

YM

File:

• codes/icosagcm/trunk/src/caldyn_gcm.f90 (modified) (6 diffs)

codes/icosagcm/trunk/src/caldyn_gcm.f90

@@ -11 +11 @@
   REAL(rstd),POINTER :: out_z(:,:)
  
+  INTEGER :: itau_out
+  
 CONTAINS
-
+  
+  SUBROUTINE init_caldyn(dt)
+  USE IOIPSL
+  IMPLICIT NONE
+    REAL(rstd),INTENT(IN) :: dt
+    REAL(rstd) :: write_period
+    CALL allocate_caldyn
+
+    CALL getin('write_period',write_period)
+    
+    itau_out=INT(write_period/dt)
+  
+  END SUBROUTINE init_caldyn
+ 
   SUBROUTINE allocate_caldyn
   USE domain_mod
@@ -78 +93 @@
   
   
-  SUBROUTINE caldyn(f_phis, f_ps, f_theta_rhodz, f_u, f_dps, f_dtheta_rhodz, f_du)
+  SUBROUTINE caldyn(it,f_phis, f_ps, f_theta_rhodz, f_u, f_dps, f_dtheta_rhodz, f_du)
   USE domain_mod
   USE dimensions
@@ -87 +102 @@
   USE vorticity_mod
   USE kinetic_mod
+  USE theta2theta_rhodz_mod
   IMPLICIT NONE
+  INTEGER,INTENT(IN)    :: it
   TYPE(t_field),POINTER :: f_phis(:)
   TYPE(t_field),POINTER :: f_ps(:)
@@ -104 +121 @@
   REAL(rstd),POINTER :: du(:,:)
   INTEGER :: ind
-  INTEGER,SAVE :: it=0
+
   
     CALL transfert_request(f_phis,req_i1) 
@@ -139 +156 @@
 !    CALL kinetic(f_du,f_out)
 
-    IF (mod(it,72)==0 ) THEN
+    IF (mod(it,itau_out)==0 ) THEN
       CALL writefield("ps",f_ps)
-      CALL writefield("dps",f_dps)
+!      CALL writefield("dps",f_dps)
 !      CALL writefield("theta_rhodz",f_theta_rhodz)
-      CALL writefield("dtheta_rhodz",f_dtheta_rhodz)
-!      CALL writefield("vort",f_out_z)
-      CALL writefield("theta",f_out)
+!      CALL writefield("dtheta_rhodz",f_dtheta_rhodz)
+      CALL vorticity(f_u,f_out_z)
+      CALL writefield("vort",f_out_z)
+!      CALL writefield("theta",f_out)
+      CALL theta_rhodz2temperature(f_ps,f_theta_rhodz,f_out) ;
+      CALL writefield("T",f_out)
     
 !      CALL writefield("out",f_out)
@@ -155 +175 @@
     ENDIF
 !    CALL check_mass_conservation(f_ps,f_dps)
-   it=it+1      
+
   END SUBROUTINE caldyn