Changeset 520 for trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

Timestamp:

Feb 10, 2012, 12:33:14 PM (13 years ago)

Author:

tnavarro

Message:

10/02/12 == TN

Major update on watercycle: a smaller integration timestep is now used

in watercloud.F, sedimentation of clouds is done in watercloud instead of
callsedim.F

Temperature-dependant contact parameter in nuclea.F
No dust lifting if CO2 ice in vdif.c
Ice integrated column opacity is written in diagfi from physiq.F, instead

of aeropacity.F. Mandatory if iradia is not 1.

New definition of permanent ice in surfini.F and possibility to have an ice

cap in it in 1d.

Update in deftank: callphys.def.outliers,run.def.1d; added traceur.def.scavenging

File:

• trunk/LMDZ.MARS/libf/phymars/simpleclouds.F (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/simpleclouds.F

@@ -1 +1 @@
       subroutine simpleclouds(ngrid,nlay,ptimestep,
      &             pplev,pplay,pzlev,pzlay,pt,pdt,
-     &             pq,pdq,pdqcloud,pdqscloud,pdtcloud,
+     &             pq,pdq,pdqcloud,pdtcloud,
      &             nq,tau,rice,nuice,rsedcloud)
       implicit none
@@ -62 +62 @@
       real pdqcloud(ngrid,nlay,nq) ! tendance de la condensation
                                    !   H2O(kg/kg.s-1)
-      real pdqscloud(ngrid,nq)     ! flux en surface (kg.m-2.s-1)
       REAL pdtcloud(ngrid,nlay)    ! tendance temperature due
                                    !   a la chaleur latente
@@ -141 +140 @@
 
         enddo ! of do ig=1,ngrid
-      enddo ! of dol=1,nlay
-
-      pdqscloud(1:ngrid,1:nq)=0
+      enddo ! of do l=1,nlay
+
       pdqcloud(1:ngrid,1:nlay,1:nq)=0
       pdtcloud(1:ngrid,1:nlay)=0
@@ -211 +209 @@
 c------------------------------------------------------------------
 c     TEST_JBM
-      IF (ngrid.eq.1) THEN
-         call WRITEDIAGFI(ngrid,"mcond","h2o condensed mass","kg",1,
-     &                    Mcon_out)
-         call WRITEDIAGFI(ngrid,"rdusttyp","rdusttyp","m",1,
-     &                    rdusttyp)
-         call WRITEDIAGFI(ngrid,"ccntyp","ccntyp","kg-1",1,
-     &                    ccntyp)
-      ENDIF
+!      IF (ngrid.eq.1) THEN
+!         call WRITEDIAGFI(ngrid,"mcond","h2o condensed mass","kg",1,
+!     &                    Mcon_out)
+!         call WRITEDIAGFI(ngrid,"rdusttyp","rdusttyp","m",1,
+!     &                    rdusttyp)
+!         call WRITEDIAGFI(ngrid,"ccntyp","ccntyp","kg-1",1,
+!     &                    ccntyp)
+!      ENDIF
 c------------------------------------------------------------------
       return