Index: trunk/mars/README
===================================================================
--- trunk/mars/README	(revision 82)
+++ trunk/mars/README	(revision 83)
@@ -588,5 +588,5 @@
    to external datafiles (topography, surface properties, etc.)
 
-== 28/02/2011 == JBM+AS
+== 28/02/2011 == JBM + AS
 >> used settings reached by JBM to obtain his PhD results
       alb_surfice = 0.45  ---  in physiq.F and meso_physiq.F
@@ -594,2 +594,11 @@
       nuice_sed = 0.45    ---  in callsedim.F
 >> NB: this is supposed to be further refined in the future
+
+== 01/03/2011 == AS + JBM
+>> nasty bug in the water cycle when iradia != 1  [no problem when iradia = 1]
+   --> mesoscale runs w/ water cycle had strange 5-hour fluctuations in RICE, from 80mic to 5mic
+>> PB: calculation of ccn [condensation nuclei] is done in callradite.F
+      * ccn must be saved 
+        --> corrected in physiq.F and meso_physiq.F
+      * ccn must not be modified elsewhere [e.g. in watercloud, when divided by ccn_factor] 
+        --> all calculations on ccn are now moved in callradite
Index: trunk/mars/libf/phymars/aeropacity.F
===================================================================
--- trunk/mars/libf/phymars/aeropacity.F	(revision 82)
+++ trunk/mars/libf/phymars/aeropacity.F	(revision 83)
@@ -106,4 +106,8 @@
                                    !   (particules kg-1)
       REAL qtot(ngridmx)           ! Dust column (kg m-2)
+
+c     CCN reduction factor
+      REAL, PARAMETER :: ccn_factor = 4.5  !! comme TESTS_JB // 1. avant
+
 c
 c   local saved variables
@@ -476,4 +480,24 @@
       ENDDO ! iaer (loop on aerosol kind)
 
+
+c -----------------------------------------------------------------
+c -----------------------------------------------------------------
+c  Reduce number of nuclei
+!         TEMPORAIRE : r�duction du nombre de nuclei FF 04/200
+!         reduction facteur 3
+!         ccn(ig,l) = ccn(ig,l) / 27.
+!         reduction facteur 2
+!         ccn(ig,l) = ccn(ig,l) / 8.
+c -----------------------------------------------------------------
+       write(*,*) "water_param CCN reduc. fac. ", ccn_factor
+       DO l=1,nlayer
+         DO ig=1,ngrid
+            ccn(ig,l) = ccn(ig,l) / ccn_factor
+         ENDDO
+       ENDDO
+c -----------------------------------------------------------------
+c -----------------------------------------------------------------
+
+
 c -----------------------------------------------------------------
 c Column integrated visible optical depth in each point
Index: trunk/mars/libf/phymars/meso_physiq.F
===================================================================
--- trunk/mars/libf/phymars/meso_physiq.F	(revision 82)
+++ trunk/mars/libf/phymars/meso_physiq.F	(revision 83)
@@ -330,4 +330,5 @@
       REAL ccn(ngridmx,nlayermx)   ! Cloud condensation nuclei
                                    !   (particules kg-1)
+      SAVE ccn  !! in case iradia != 1 
       real rdust(ngridmx,nlayermx) ! dust geometric mean radius (m)
       real qtot1,qtot2 ! total aerosol mass
Index: trunk/mars/libf/phymars/physiq.F
===================================================================
--- trunk/mars/libf/phymars/physiq.F	(revision 82)
+++ trunk/mars/libf/phymars/physiq.F	(revision 83)
@@ -279,4 +279,5 @@
       REAL ccn(ngridmx,nlayermx)   ! Cloud condensation nuclei
                                    !   (particules kg-1)
+      SAVE ccn  !! in case iradia != 1
       real rdust(ngridmx,nlayermx) ! dust geometric mean radius (m)
       real qtot1,qtot2 ! total aerosol mass
Index: trunk/mars/libf/phymars/watercloud.F
===================================================================
--- trunk/mars/libf/phymars/watercloud.F	(revision 82)
+++ trunk/mars/libf/phymars/watercloud.F	(revision 83)
@@ -55,6 +55,4 @@
       REAL ccn(ngridmx,nlayermx)   ! Cloud condensation nuclei
                                    !   (particules kg-1)
-c     CCN reduction factor
-      REAL, PARAMETER :: ccn_factor = 4.5  !! comme TESTS_JB // 1. avant
       real rdust(ngridmx,nlayermx) ! Dust geometric mean radius (m)
 
@@ -137,6 +135,4 @@
         write(*,*) "            i_ice=",i_ice
 
-        write(*,*) "water_param CCN reduction factor:", ccn_factor
- 
         firstcall=.false.
       ENDIF ! of IF (firstcall)
@@ -172,10 +168,4 @@
       do l=1,nlay
         do ig=1,ngrid
-          ccn(ig,l) = ccn(ig,l) / ccn_factor
-c         TEMPORAIRE : réduction du nombre de nuclei FF 04/2008 :
-c         reduction facteur 3
-c         ccn(ig,l) = ccn(ig,l) / 27.
-c         reduction facteur 2
-c         ccn(ig,l) = ccn(ig,l) / 8.
 c         Calcul du rayon moyen des particules de glace.
 c         Hypothese : Dans une couche, la glace presente se
