Index: /trunk/LMDZ.PLUTO/deftank/README.md
===================================================================
--- /trunk/LMDZ.PLUTO/deftank/README.md	(revision 3422)
+++ /trunk/LMDZ.PLUTO/deftank/README.md	(revision 3422)
@@ -0,0 +1,8 @@
+In this folder, you will find examples .def files for the Pluto PCM. 
+
+In case you use def files from the old Pluto model, you can use `restart.old_pluto_to_new.def` to convert them (new model is in AU while old model in million of km). 
+
+In the 1D folder, callphys.def for various examples including hazes with profiles from Zhang et al 2017, a haze-generation routine (hazecloud) with a fixed particle radius, and without hazes. 
+
+In the 3D folder, TBD
+
Index: /trunk/LMDZ.PLUTO/deftank/restart.old_pluto_to_new.def
===================================================================
--- /trunk/LMDZ.PLUTO/deftank/restart.old_pluto_to_new.def	(revision 3422)
+++ /trunk/LMDZ.PLUTO/deftank/restart.old_pluto_to_new.def	(revision 3422)
@@ -0,0 +1,8 @@
+1
+n
+periastr
+29.658309835823086
+apoastr
+49.30504669275349
+
+
Index: /trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/leapfrog_nogcm.F
===================================================================
--- /trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/leapfrog_nogcm.F	(revision 3421)
+++ /trunk/LMDZ.PLUTO/libf/dynphy_lonlat/phypluto/leapfrog_nogcm.F	(revision 3422)
@@ -13,5 +13,4 @@
 #endif
       USE infotrac, ONLY: nqtot,ok_iso_verif,tname
-      USE guide_mod, ONLY : guide_main
       USE write_field, ONLY: writefield
       USE callkeys_mod, only: tau_n2, tau_ch4, tau_co
@@ -24,5 +23,4 @@
       use exner_milieu_m, only: exner_milieu
       use cpdet_mod, only: cpdet,tpot2t,t2tpot
-      use sponge_mod, only: callsponge,mode_sponge,sponge
        use comuforc_h
       USE comvert_mod, ONLY: ap,bp,pressure_exner,presnivs,
Index: /trunk/LMDZ.PLUTO/libf/phypluto/callcorrk_pluto_mod.F90
===================================================================
--- /trunk/LMDZ.PLUTO/libf/phypluto/callcorrk_pluto_mod.F90	(revision 3421)
+++ /trunk/LMDZ.PLUTO/libf/phypluto/callcorrk_pluto_mod.F90	(revision 3422)
@@ -621,5 +621,5 @@
             print*,'transfer kmatrix bounds, exiting.'
             print*,'t(',k,')=',tlevrad(k),' < ',tgasmin
-            call abort
+            ! call abort
           elseif(tlevrad(k).gt.tgasmax)then
             print*,'Maximum temperature is outside the radiative'
Index: /trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90
===================================================================
--- /trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90	(revision 3421)
+++ /trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90	(revision 3422)
@@ -1387,5 +1387,4 @@
      if (is_master) write(*,*)trim(rname)//": generic_condensation = ",generic_condensation
 
-! Test of incompatibility:
      if (is_master) write(*,*)trim(rname)//": Spectral Dependant albedo ?"
      albedo_spectral_mode=.false. ! default value
@@ -1436,4 +1435,10 @@
      call getin_p("cpp_mugaz_mode",cpp_mugaz_mode)
      if (is_master) write(*,*)trim(rname)//": cpp_mugaz_mode = ",cpp_mugaz_mode
+
+
+! Test of incompatibility:
+     if (condcosurf.and.no_n2frost) then
+       call abort_physic(rname, "CO surface condensation and no_n2frost are both active which may not be relevant", 1)
+     end if
 
      if ((cpp_mugaz_mode >= 1).and.(is_master).and.(ngrid>1)) then
Index: /trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90
===================================================================
--- /trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90	(revision 3421)
+++ /trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90	(revision 3422)
@@ -2287,7 +2287,5 @@
 
 !       ! Oceanic layers !AF24: removed
-
       ! ! Thermal plume model  !AF24: removed
-
 !        GW non-oro outputs  !AF24: removed
 
@@ -2309,7 +2307,4 @@
 !           call writediagfi(ngrid,"fluxsurflwcs","lw back radiation (cs).","W m-2",2,fluxsurf_lw1)
 
-         ! if(ok_slab_ocean) then
-         !    call writediagfi(ngrid,"GND","heat flux from ground","W m-2",2,fluxgrdocean)
-         ! else
          call writediagfi(ngrid,"GND","heat flux from ground","W m-2",2,fluxgrd)
          ! endif
@@ -2366,5 +2361,5 @@
         call writediagfi(ngrid,"zdtlw","LW heating","T s-1",3,zdtlw)
         call writediagfi(ngrid,"dtrad","radiative heating","K s-1",3,dtrad)
-      ! call writediagfi(ngrid,"zdtdyn","Dyn. heating","T s-1",3,zdtdyn)
+        call writediagfi(ngrid,"zdtdyn","Dyn. heating","T s-1",3,zdtdyn)
 
         !Pluto specific
@@ -2396,10 +2391,10 @@
          do iq=1,nq
           call writediagfi(ngrid,noms(iq),noms(iq),'kg/kg',3,zq(1,1,iq))
-          !  call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf',  &
-          !                   'kg m^-2',2,qsurf_hist(1,iq) )
+         !   call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf',  &
+         !                    'kg m^-2',2,qsurf_hist(1,iq) )
            call writediagfi(ngrid,trim(noms(iq))//'_col',trim(noms(iq))//'_col',    &
                            'kg m^-2',2,qcol(1,iq) )
-!          call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf',  &
-!                          'kg m^-2',2,qsurf(1,iq) )
+         call writediagfi(ngrid,trim(noms(iq))//'_surf',trim(noms(iq))//'_surf',  &
+                         'kg m^-2',2,qsurf(1,iq) )
 
             ! if(watercond.or.CLFvarying)then  !AF24: removed
@@ -2419,6 +2414,6 @@
 
          !Pluto specific
-         !call writediagfi(ngrid,'n2_iceflux','n2_iceflux',"kg m^-2 s^-1",2,flusurf(1,igcm_n2) )
-         ! call writediagfi(ngrid,'haze_reff','haze_reff','m',3,reffrad(1,1,1))
+         call writediagfi(ngrid,'n2_iceflux','n2_iceflux',"kg m^-2 s^-1",2,flusurf(1,igcm_n2) )
+         call writediagfi(ngrid,'haze_reff','haze_reff','m',3,reffrad(1,1,1))
          if (methane) then
             call writediagfi(ngrid,'ch4_iceflux','ch4_iceflux',&