Changeset 99

Timestamp:

08/04/12 02:33:28 (12 years ago)

Author:

ymipsl

Message:

Output precipitation in dcmip physics

YM

Location:

codes/icosagcm/trunk/src

Files:

• physics.f90 (modified) (2 diffs)
• physics_dcmip.f90 (modified) (6 diffs)
• timeloop_gcm.f90 (modified) (1 diff)

codes/icosagcm/trunk/src/physics.f90

@@ -27 +27 @@
   END SUBROUTINE init_physics
 
-  SUBROUTINE physics(f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
+  SUBROUTINE physics(it,f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
   USE icosa
   USE physics_dcmip_mod, physics_dcmip=>physics
   IMPLICIT NONE
+    INTEGER, INTENT(IN)   :: it
     TYPE(t_field),POINTER :: f_phis(:)
     TYPE(t_field),POINTER :: f_ps(:)
@@ -41 +42 @@
     
       CASE ('dcmip')
-        CALL physics_dcmip(f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
+        CALL physics_dcmip(it, f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
       
       CASE DEFAULT

codes/icosagcm/trunk/src/physics_dcmip.f90

@@ -6 +6 @@
   PUBLIC init_physics, physics
   TYPE(t_field),POINTER :: f_out_i(:)
+  TYPE(t_field),POINTER :: f_precl(:)
     REAL(rstd),POINTER :: out_i(:,:)
 
@@ -16 +17 @@
     CALL getin("dcmip_physics",testcase)
     CALL allocate_field(f_out_i,field_t,type_real,llm)
+    CALL allocate_field(f_precl,field_t,type_real)
         
   END SUBROUTINE init_physics
 
 
-  SUBROUTINE physics( f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
+  SUBROUTINE physics( it, f_phis, f_ps, f_theta_rhodz, f_ue, f_q)
   USE icosa
   IMPLICIT NONE
+    INTEGER,INTENT(IN)    :: it
     TYPE(t_field),POINTER :: f_phis(:)
     TYPE(t_field),POINTER :: f_ps(:)
@@ -34 +37 @@
     REAL(rstd),POINTER :: ue(:,:)
     REAL(rstd),POINTER :: q(:,:,:)
+    REAL(rstd),POINTER :: precl(:)
     INTEGER :: ind
 
@@ -46 +50 @@
       q=f_q(ind)
       out_i=f_out_i(ind)
+      precl=f_precl(ind)
     
-      CALL compute_physics( phis, ps, theta_rhodz, ue, q(:,:,3))
+      CALL compute_physics( phis, ps, theta_rhodz, ue, q(:,:,3), precl)
   
     ENDDO
-!    CALL writefield("out_i",f_out_i)
+    
+    IF (mod(it,itau_out)==0 ) THEN
+      CALL writefield("precl",f_precl)
+    ENDIF
 
   END SUBROUTINE physics
   
-  SUBROUTINE compute_physics(phis, ps, theta_rhodz, ue, q)
+  SUBROUTINE compute_physics(phis, ps, theta_rhodz, ue, q, precl)
   USE icosa
   USE pression_mod
@@ -67 +75 @@
     REAL(rstd) :: ue(3*iim*jjm,llm)
     REAL(rstd) :: q(iim*jjm,llm)
+    REAL(rstd) :: precl(iim*jjm)
 
     REAL(rstd) :: p(iim*jjm,llm+1)
@@ -84 +93 @@
     REAL(rstd) :: pmid(iim*jjm,llm)
     REAL(rstd) :: pdel(iim*jjm,llm)
-    REAL(rstd) :: precl(iim*jjm)
     INTEGER :: i,j,l,ij
      

codes/icosagcm/trunk/src/timeloop_gcm.f90

@@ -116 +116 @@
     CALL caldyn(it,f_phis,f_ps,f_theta_rhodz,f_u, f_dps, f_dtheta_rhodz, f_du)
     CALL advect_tracer(f_ps,f_u,f_q)
-    CALL physics(f_phis, f_ps, f_theta_rhodz, f_u, f_q)
+    CALL physics(it,f_phis, f_ps, f_theta_rhodz, f_u, f_q)
     
     SELECT CASE (TRIM(scheme))