Index: trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90
===================================================================
--- trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90	(revision 1485)
+++ trunk/LMDZ.GENERIC/libf/phystd/phyetat0.F90	(revision 1493)
@@ -376,11 +376,15 @@
   do iq=1,nq
     txt=tname(iq)
-    if (txt.eq."h2o_vap") then
+    
+    !! There was a bug here. MT2015.
+    
+    !if (txt.eq."h2o_vap") then
       ! There is no surface tracer for h2o_vap;
       ! "h2o_ice" should be loaded instead
-      txt="h2o_ice"
-      write(*,*) 'phyetat0: loading surface tracer', &
-                           ' h2o_ice instead of h2o_vap'
-    endif
+     ! txt="h2o_ice"
+     ! write(*,*) 'phyetat0: loading surface tracer', &
+     !                      ' h2o_ice instead of h2o_vap'
+    !endif
+    
     call get_field(txt,qsurf(:,iq),found,indextime)
     if (.not.found) then
Index: trunk/LMDZ.GENERIC/libf/phystd/physiq.F90
===================================================================
--- trunk/LMDZ.GENERIC/libf/phystd/physiq.F90	(revision 1485)
+++ trunk/LMDZ.GENERIC/libf/phystd/physiq.F90	(revision 1493)
@@ -1831,5 +1831,5 @@
 
             ! enforce ice conservation
-            ice_tot= SUM(qsurf_hist(:,igcm_h2o_ice)*area(:) )
+            ice_tot= SUM(qsurf_hist(:,igcm_h2o_ice)*area(:) )/SUM(area(:))
             qsurf_hist(:,igcm_h2o_ice) = qsurf_hist(:,igcm_h2o_ice)*(icesrf/ice_tot)