Changeset 1647 for trunk/LMDZ.TITAN/libf/phytitan/callsedim.F

Timestamp:

Jan 11, 2017, 3:33:51 PM (8 years ago)

Author:

jvatant

Message:

+ Major clean of the new LMDZ.TITAN from too-generic options and routines (water, co2, ocean, surface type ...)
+ From this revision LMDZ.TITAN begins to be really separated from LMDZ.GENERIC
+ Partial desactivation of aerosols, only the dummy case is still enabled to keep the code running ( new aerosol routines to come in followings commits )

JVO

File:

• trunk/LMDZ.TITAN/libf/phytitan/callsedim.F (modified) (6 diffs)

trunk/LMDZ.TITAN/libf/phytitan/callsedim.F

@@ -4 +4 @@
 
       use radinc_h, only : naerkind
-      use radii_mod, only: h2o_reffrad
-      use aerosol_mod, only : iaero_h2o
-      USE tracer_h, only : igcm_co2_ice,igcm_h2o_ice,radius,rho_q
+      USE tracer_h, only : radius, rho_q
       use comcstfi_mod, only: g
-      use callkeys_mod, only : water
 
       IMPLICIT NONE
@@ -62 +59 @@
       real epaisseur (ngrid,nlay) ! Layer thickness (m)
       real wq(ngrid,nlay+1) ! displaced tracer mass (kg.m-2)
-c      real dens(ngrid,nlay) ! Mean density of the ice part. accounting for dust core
 
 
@@ -73 +69 @@
       IF (firstcall) THEN
         firstcall=.false.
-        ! add some tests on presence of required tracers/aerosols:
-        if (water) then
-          if (igcm_h2o_ice.eq.0) then
-            write(*,*) "callsedim error: water=.true.",
-     &                 " but igcm_h2o_ice=0"
-          stop
-          endif
-          if (iaero_h2o.eq.0) then
-            write(*,*) "callsedim error: water=.true.",
-     &                 " but iaero_ho2=0"
-          stop
-          endif
-        endif
       ENDIF ! of IF (firstcall)
       
@@ -106 +89 @@
  
       do iq=1,nq
-       if((radius(iq).gt.1.e-9).and.(iq.ne.igcm_co2_ice)) then   
-!         (no sedim for gases, and co2_ice sedim is done in condense_co2)      
+       if(radius(iq).gt.1.e-9) then   
+!         (no sedim for gases)      
 
 ! store locally updated tracers
@@ -120 +103 @@
 ! Sedimentation 
 !======================================================================
-! Water          
-          if (water.and.(iq.eq.igcm_h2o_ice)) then
-            ! compute radii for h2o_ice 
-             call h2o_reffrad(ngrid,nlay,zqi(1,1,igcm_h2o_ice),zt,
-     &                reffrad(1,1,iaero_h2o),nueffrad(1,1,iaero_h2o))
-            ! call sedimentation for h2o_ice
-             call newsedim(ngrid,nlay,ngrid*nlay,ptimestep,
-     &            pplev,masse,epaisseur,zt,reffrad(1,1,iaero_h2o),
-     &            rho_q(iq),zqi(1,1,igcm_h2o_ice),wq)
-
 ! General Case
-          else 
              call newsedim(ngrid,nlay,1,ptimestep,
      &            pplev,masse,epaisseur,zt,radius(iq),rho_q(iq),
      &            zqi(1,1,iq),wq)
-          endif
 
 !=======================================================================
@@ -152 +123 @@
             ENDDO
           ENDDO
-       endif ! of no gases no co2_ice
+       endif ! of no gases
       enddo ! of do iq=1,nq
       return