Changeset 409 for codes/icosagcm

Timestamp:

06/09/16 02:17:06 (8 years ago)

Author:

ymipsl

Message:

adapt dcmip 2016 kessler physic
YM

File:

• codes/icosagcm/trunk/src/physics_dcmip2016.f90 (modified) (8 diffs)

codes/icosagcm/trunk/src/physics_dcmip2016.f90

@@ -65 +65 @@
     ! Physics-specific data
     ALLOCATE(precl_packed(ngrid))
-    precl_packed(:)=0.
     CALL allocate_field(f_precl, field_t,type_real)
 
@@ -85 +84 @@
     CALL unpack_field(f_precl, precl_packed)
     CALL output_field("precl",f_precl)
-    precl_packed(:)=0.
-    
+       
   END SUBROUTINE write_physics
 
@@ -93 +91 @@
     USE dcmip2016_simple_physics_mod
     USE dcmip2016_kessler_physic_mod
+    USE earth_const
     USE terminator
     IMPLICIT NONE
@@ -144 +143 @@
           vfi(ij,l)=v(ij,ll)
           qfi(ij,l,:)=q(ij,ll,:)
-          Tfi(ij,l)=Temp(ij,ll)/(1+0.608*qfi(ij,l,1))  
+          IF (physics_thermo==thermo_fake_moist) THEN
+            Tfi(ij,l)=Temp(ij,ll)/(1+0.608*qfi(ij,l,1)) 
+          ELSE
+            Tfi(ij,l)=Temp(ij,ll)
+          ENDIF
        ENDDO
     ENDDO
@@ -153 +156 @@
       IF (testcase==cyclone) simple_physic_testcase=0
       CALL simple_physics(ngrid, llm, dt_phys, lat, tfi, qfi(:,:,1) , ufi, vfi, pmid, pint, pdel, 1./pdel, ps, precl, &
-                          simple_physic_testcase, .TRUE., .FALSE.)
+                          simple_physic_testcase, .FALSE., .FALSE.)
     ENDIF
 
@@ -163 +166 @@
            ll=llm+1-l
            rho(l) = pmid(ij,ll)/(287*Temp(ij,l))
-           z(l)=lastz+ (p(ij,l)-p(ij,l+1)) /g / rho(l)
-           lastz=z(l)
-!           theta(l)= Tfi(ij,ll)*(1+0.608*qfi(ij,ll,1)) / ( pk(ij,l) / cpp)
+           z(l)=lastz
+           lastz=lastz+ (p(ij,l)-p(ij,l+1)) /g / rho(l)
            theta(l)= Tfi(ij,ll) / ( pk(ij,l) / cpp)
           ENDDO
@@ -173 +175 @@
           qr(:)=qfi(ij,llm:1:-1,3)
           
-!          CALL KESSLER(theta(:), qv, qc, qr, rho(:),  &
-!                       pk(ij,:), dt_phys, z(:), llm, precl(ij)) 
+          CALL KESSLER(theta(:), qv, qc, qr, rho(:),  &
+                       pk(ij,:)/cpp, dt_phys, z(:), llm, precl(ij)) 
           
           
           DO l=1,llm
            ll=llm+1-l
-!           Tfi(ij,ll) = theta(l) /(1+0.608*qfi(ij,ll,1)) * ( pk(ij,l) / cpp)
            Tfi(ij,ll) = theta(l)  * ( pk(ij,l) / cpp)
           ENDDO
@@ -205 +206 @@
        ll=llm+1-l
        DO ij=1,ngrid
-          dTemp(ij,l) = inv_dt * ( Tfi(ij,ll)*(1+0.608*qfi(ij,ll,1)) - Temp(ij,l) )
+          IF (physics_thermo==thermo_fake_moist) THEN
+            dTemp(ij,l) = inv_dt * ( Tfi(ij,ll)*(1+0.608*qfi(ij,ll,1)) - Temp(ij,l) )
+          ELSE
+            dTemp(ij,l) = inv_dt * ( Tfi(ij,ll) - Temp(ij,l) )
+          ENDIF
+          
           du(ij,l) = inv_dt * (ufi(ij,ll) - u(ij,l))
           dv(ij,l) = inv_dt * (vfi(ij,ll) - v(ij,l))