Index: /trunk/LMDZ.COMMON/libf/evolution/changelog.txt
===================================================================
--- /trunk/LMDZ.COMMON/libf/evolution/changelog.txt	(revision 3121)
+++ /trunk/LMDZ.COMMON/libf/evolution/changelog.txt	(revision 3122)
@@ -130,2 +130,5 @@
 == 03/11/2023 == JBC
 Following r3113, addition of 'nqsoil' and 'qsoil' in the arguments of the subroutines 'phyetat0' and 'physdem1' to be able to compile.
+
+== 10/11/2023 == JBC
+Correction of the reading of the PCM data (it did not work if no slope was used) + some minor related cleanings.
Index: /trunk/LMDZ.COMMON/libf/evolution/pem.F90
===================================================================
--- /trunk/LMDZ.COMMON/libf/evolution/pem.F90	(revision 3121)
+++ /trunk/LMDZ.COMMON/libf/evolution/pem.F90	(revision 3122)
@@ -604,7 +604,7 @@
 !------------------------
 call pemetat0("startpem.nc",ngrid,nsoilmx,nsoilmx_PEM,nslope,timelen,timestep,TI_PEM,tsoil_PEM,porefillingice_depth, &
-              porefillingice_thickness,tsurf_ave_yr1, tsurf_ave, q_co2_PEM_phys, q_h2o_PEM_phys,ps_timeseries,          &
-              tsoil_phys_PEM_timeseries,tendencies_h2o_ice,tendencies_co2_ice,qsurf(:,igcm_co2,:),                      &
-              qsurf(:,igcm_h2o_ice,:),global_ave_press_GCM,watersurf_density_ave,watersoil_density_PEM_ave,             &
+              porefillingice_thickness,tsurf_ave_yr1, tsurf_ave, q_co2_PEM_phys, q_h2o_PEM_phys,ps_timeseries,       &
+              tsoil_phys_PEM_timeseries,tendencies_h2o_ice,tendencies_co2_ice,qsurf(:,igcm_co2,:),                   &
+              qsurf(:,igcm_h2o_ice,:),global_ave_press_GCM,watersurf_density_ave,watersoil_density_PEM_ave,          &
               co2_adsorbded_phys,delta_co2_adsorbded,h2o_adsorbded_phys,delta_h2o_adsorbded,water_reservoir)
 
@@ -717,7 +717,7 @@
         do t = 1,timelen
             q_co2_PEM_phys(ig,t) = q_co2_PEM_phys(ig,t)*(zplev_old_timeseries(ig,l,t) - zplev_old_timeseries(ig,l + 1,t))/ &
-                                   (zplev_new_timeseries(ig,l,t) - zplev_new_timeseries(ig,l + 1,t))   &
-                                + ((zplev_new_timeseries(ig,l,t) - zplev_new_timeseries(ig,l + 1,t))   &
-                                -  (zplev_old_timeseries(ig,l,t) - zplev_old_timeseries(ig,l + 1,t)))/ &
+                                   (zplev_new_timeseries(ig,l,t) - zplev_new_timeseries(ig,l + 1,t))                       &
+                                + ((zplev_new_timeseries(ig,l,t) - zplev_new_timeseries(ig,l + 1,t))                       &
+                                -  (zplev_old_timeseries(ig,l,t) - zplev_old_timeseries(ig,l + 1,t)))/                     &
                                    (zplev_new_timeseries(ig,l,t) - zplev_new_timeseries(ig,l + 1,t))
             if (q_co2_PEM_phys(ig,t) < 0) then
@@ -861,15 +861,13 @@
 
         deallocate(TI_locslope,Tsoil_locslope,Tsurf_locslope)
+
+! II_d.3 Update the ice table
         write(*,*) "Compute ice table"
-
-! II_d.3 Update the ice table
         porefillingice_thickness_prev_iter(:,:) = porefillingice_thickness(:,:)
         call computeice_table_equilibrium(ngrid,nslope,nsoilmx_PEM,watercaptag,watersurf_density_ave,watersoil_density_PEM_ave,TI_PEM(:,1,:),porefillingice_depth,porefillingice_thickness)
-
         call compute_massh2o_exchange_ssi(ngrid,nslope,nsoilmx_PEM,porefillingice_thickness_prev_iter,porefillingice_thickness,porefillingice_depth,tsoil_PEM,delta_h2o_icetablesublim) ! Mass of H2O exchange between the ssi and the atmosphere
 
+! II_d.4 Update the soil thermal properties
         write(*,*) "Update soil propreties"
-
-! II_d.4 Update the soil thermal properties
         call update_soil_thermalproperties(ngrid,nslope,nsoilmx_PEM,tendencies_h2o_ice,qsurf(:,igcm_h2o_ice,:),global_ave_press_new,porefillingice_depth,porefillingice_thickness,TI_PEM)
 
@@ -932,5 +930,5 @@
     i_myear = i_myear + dt_pem
 
-    write(*,*) "Checking all the stopping criterion."
+    write(*,*) "Checking all the stopping criteria..."
     if (STOPPING_water) then
         write(*,*) "STOPPING because surface of water ice sublimating is too low, see message above", STOPPING_water
@@ -1136,5 +1134,5 @@
              float(day_ini),0.,nslope,def_slope,subslope_dist)
 call pemdem1("restartpem.nc",i_myear,nsoilmx_PEM,ngrid,nslope,tsoil_PEM, &
-             TI_PEM, porefillingice_depth,porefillingice_thickness,         &
+             TI_PEM, porefillingice_depth,porefillingice_thickness,      &
              co2_adsorbded_phys,h2o_adsorbded_phys,water_reservoir)
 write(*,*) "restartpem.nc has been written"
Index: /trunk/LMDZ.COMMON/libf/evolution/read_data_PCM_mod.F90
===================================================================
--- /trunk/LMDZ.COMMON/libf/evolution/read_data_PCM_mod.F90	(revision 3121)
+++ /trunk/LMDZ.COMMON/libf/evolution/read_data_PCM_mod.F90	(revision 3122)
@@ -7,6 +7,7 @@
 implicit none
 
-character(256) :: msg, var, modname ! for reading
-integer        :: fID, vID          ! for reading
+character(13), parameter :: modname = 'read_data_PCM'
+character(256)           :: msg      ! for reading
+integer                  :: fID, vID ! for reading
 
 !=======================================================================
@@ -14,5 +15,5 @@
 !=======================================================================
 
-SUBROUTINE read_data_PCM(fichnom,timelen,iim_input,jjm_input,ngrid,nslope,vmr_co2_gcm_phys,ps_timeseries,           &
+SUBROUTINE read_data_PCM(filename,timelen,iim_input,jjm_input,ngrid,nslope,vmr_co2_gcm_phys,ps_timeseries,          &
                          min_co2_ice,min_h2o_ice,tsurf_ave,tsoil_ave,tsurf_gcm,tsoil_gcm,q_co2,q_h2o,co2_ice_slope, &
                          watersurf_density_ave,watersoil_density)
@@ -35,5 +36,5 @@
 ! Arguments:
 
-character(len = *), intent(in) :: fichnom                             !--- FILE NAME
+character(len = *), intent(in) :: filename                            ! File name
 integer,            intent(in) :: timelen                             ! number of times stored in the file
 integer                        :: iim_input, jjm_input, ngrid, nslope ! number of points in the lat x lon dynamical grid, number of subgrid slopes
@@ -53,6 +54,6 @@
 real, dimension(ngrid,nslope),                 intent(out) :: watersurf_density_ave ! Water density at the surface [kg/m^3]
 real, dimension(ngrid,nsoilmx,nslope,timelen), intent(out) :: watersoil_density     ! Water density in the soil layer, time series [kg/m^3]
-!===============================================================================
-!   Local Variables
+!=======================================================================
+! Local Variables
 character(12)                   :: start_file_type = "earth" ! default start file type
 real, dimension(:), allocatable :: time      ! times stored in start
@@ -60,10 +61,10 @@
 integer                         :: edges(4), corner(4)
 integer                         :: i, j, l, t          ! loop variables
-real                            ::  A , B, mmean       ! Molar Mass of co2 and no co2, A;B intermediate variables to compute the mean molar mass of the layer
+real                            :: A, B, mmean         ! Molar Mass of co2 and no co2, A;B intermediate variables to compute the mean molar mass of the layer
 integer                         :: islope              ! loop for variables
 character(2)                    :: num                 ! for reading sloped variables
 real, dimension(iim_input + 1,jjm_input + 1,nslope,timelen)         :: h2o_ice_s_dyn         ! h2o ice per slope of the concatenated file [kg/m^2]
-real, dimension(iim_input + 1,jjm_input + 1,nslope,timelen)         :: watercap_slope
-real, dimension(iim_input + 1,jjm_input + 1,timelen)                :: vmr_co2_gcm           ! CO2 volume mixing ratio in the first layer  [mol/m^3]
+real, dimension(iim_input + 1,jjm_input + 1,nslope,timelen)         :: watercap
+real, dimension(iim_input + 1,jjm_input + 1,timelen)                :: vmr_co2_gcm           ! CO2 volume mixing ratio in the first layer [mol/m^3]
 real, dimension(iim_input + 1,jjm_input + 1,timelen)                :: ps_GCM                ! Surface Pressure [Pa]
 real, dimension(iim_input + 1,jjm_input + 1,nslope)                 :: min_co2_ice_dyn
@@ -79,123 +80,106 @@
 real, dimension(iim_input + 1,jjm_input + 1,nsoilmx,nslope,timelen) :: watersoil_density_dyn ! Water density in the soil layer, time series [kg/m^3]
 real, dimension(ngrid,nslope,timelen)                               :: watersurf_density     ! Water density at the surface, time series [kg/m^3]
-
 !-----------------------------------------------------------------------
-modname="read_data_PCM"
-
-A = (1/m_co2 - 1/m_noco2)
-B = 1/m_noco2
-
-write(*,*) "Opening ", fichnom, "..."
-
-!  Open initial state NetCDF file
-var = fichnom
-call error_msg(NF90_OPEN(var,NF90_NOWRITE,fID),"open",var)
-
-write(*,*) "Downloading data for vmr co2..."
-
-call get_var3("co2_layer1"   ,q_co2_dyn)
-
-write(*,*) "Downloading data for vmr co2 done"
-write(*,*) "Downloading data for vmr h20..."
-
-call get_var3("h2o_layer1"   ,q_h2o_dyn)
-
-write(*,*) "Downloading data for vmr h2o done"
-write(*,*) "Downloading data for surface pressure ..."
-
-call get_var3("ps"   ,ps_GCM)
-
-write(*,*) "Downloading data for surface pressure done"
-write(*,*) "nslope=", nslope
-
-if (nslope > 1) then
-    write(*,*) "Downloading data for co2ice_slope ..."
-
+! Open the NetCDF file
+write(*,*) "Opening "//filename//"..."
+call error_msg(NF90_OPEN(filename,NF90_NOWRITE,fID),"open",filename)
+
+! Dowload the data from the file
+call get_var3("ps",ps_GCM)
+write(*,*) "Data for surface pressure downloaded!"
+
+call get_var3("co2_layer1",q_co2_dyn)
+write(*,*) "Data for vmr co2 downloaded!"
+
+call get_var3("h2o_layer1",q_h2o_dyn)
+write(*,*) "Data for vmr h2o downloaded!"
+
+if (nslope == 1) then ! There is no slope
+    call get_var3("co2ice",co2_ice_slope_dyn(:,:,1,:))
+    write(*,*) "Data for co2_ice downloaded!"
+
+    call get_var3("h2o_ice_s",h2o_ice_s_dyn(:,:,1,:))
+    write(*,*) "Data for h2o_ice_s downloaded!"
+
+#ifndef CPP_STD
+    call get_var3("watercap",watercap(:,:,1,:))
+    write(*,*) "Data for watercap downloaded!"
+#endif
+
+    call get_var3("tsurf",tsurf_gcm_dyn(:,:,1,:))
+    write(*,*) "Data for tsurf downloaded!"
+
+#ifndef CPP_STD
+    if (soil_pem) then
+        call get_var4("soiltemp",tsoil_gcm_dyn(:,:,:,1,:))
+        write(*,*) "Data for soiltemp downloaded!"
+
+        call get_var4("waterdensity_soil",watersoil_density_dyn(:,:,:,1,:))
+        write(*,*) "Data for waterdensity_soil downloaded!"
+
+        call get_var3("waterdensity_surface",watersurf_density_dyn(:,:,islope,:))
+        write(*,*) "Data for waterdensity_surface downloaded!"
+    endif !soil_pem
+#endif
+else ! We use slopes
     do islope = 1,nslope
         write(num,'(i2.2)') islope
         call get_var3("co2ice_slope"//num,co2_ice_slope_dyn(:,:,islope,:))
     enddo
-    
-    write(*,*) "Downloading data for co2ice_slope done"
-    write(*,*) "Downloading data for h2o_ice_s_slope ..."
-    
+    write(*,*) "Data for co2_ice downloaded!"
+
     do islope = 1,nslope
         write(num,'(i2.2)') islope
         call get_var3("h2o_ice_s_slope"//num,h2o_ice_s_dyn(:,:,islope,:))
     enddo
-
-    write(*,*) "Downloading data for h2o_ice_s_slope done"
+    write(*,*) "Data for h2o_ice_s downloaded!"
 
 #ifndef CPP_STD
-    write(*,*) "Downloading data for watercap_slope ..."
     do islope = 1,nslope
         write(num,'(i2.2)') islope
-        call get_var3("watercap_slope"//num,watercap_slope(:,:,islope,:))
-!        watercap_slope(:,:,:,:) = 0.
-    enddo
-    write(*,*) "Downloading data for watercap_slope done"
-#endif
-
-    write(*,*) "Downloading data for tsurf_slope ..."
-
-    do islope=1,nslope
+        call get_var3("watercap_slope"//num,watercap(:,:,islope,:))
+    enddo
+    write(*,*) "Data for watercap downloaded!"
+#endif
+
+    do islope = 1,nslope
         write(num,'(i2.2)') islope
         call get_var3("tsurf_slope"//num,tsurf_gcm_dyn(:,:,islope,:))
     enddo
-
-    write(*,*) "Downloading data for tsurf_slope done"
+    write(*,*) "Data for tsurf downloaded!"
 
 #ifndef CPP_STD
     if (soil_pem) then
-        write(*,*) "Downloading data for soiltemp_slope ..."
-
         do islope = 1,nslope
             write(num,'(i2.2)') islope
             call get_var4("soiltemp_slope"//num,tsoil_gcm_dyn(:,:,:,islope,:))
         enddo
-
-        write(*,*) "Downloading data for soiltemp_slope done"
-        write(*,*) "Downloading data for watersoil_density ..."
+        write(*,*) "Data for soiltemp downloaded!"
 
         do islope = 1,nslope
             write(num,'(i2.2)') islope
-            call get_var4("Waterdensity_soil_slope"//num,watersoil_density_dyn(:,:,:,islope,:))
-        enddo
-
-        write(*,*) "Downloading data for  watersoil_density  done"
-        write(*,*) "Downloading data for  watersurf_density  ..."
+            call get_var4("waterdensity_soil_slope"//num,watersoil_density_dyn(:,:,:,islope,:))
+        enddo
+        write(*,*) "Data for waterdensity_soil downloaded!"
 
         do islope = 1,nslope
             write(num,'(i2.2)') islope
-            call get_var3("Waterdensity_surface"//num,watersurf_density_dyn(:,:,islope,:))
-        enddo
-
-        write(*,*) "Downloading data for  watersurf_density  done"
-
+            call get_var3("waterdensity_surface"//num,watersurf_density_dyn(:,:,islope,:))
+        enddo
+        write(*,*) "Data for waterdensity_surface downloaded!"
     endif !soil_pem
 #endif
-else !nslope = 1 no slope, we copy all the values
-    call get_var3("h2o_ice_s", h2o_ice_s_dyn(:,:,1,:))
-    call get_var3("co2ice", co2_ice_slope_dyn(:,:,1,:))
-    call get_var3("tsurf", tsurf_gcm_dyn(:,:,1,:))
-    
-#ifndef CPP_STD
-!    call get_var3("watercap", watercap_slope(:,:,1,:))
-    watercap_slope(:,:,1,:) = 0.
-    watersurf_density_dyn(:,:,:,:) = 0.
-    watersoil_density_dyn(:,:,:,:,:) = 0.
-#endif
-
-    if (soil_pem) call get_var4("soiltemp",tsoil_gcm_dyn(:,:,:,1,:))
-endif !nslope=1
+endif
 
 ! Compute the minimum over the year for each point
-write(*,*) "Computing the min of h2o_ice_slope"
-min_h2o_ice_dyn(:,:,:) = minval(h2o_ice_s_dyn + watercap_slope,4)
-write(*,*) "Computing the min of co2_ice_slope"
+write(*,*) "Computing the min of h2o_ice..."
+where (h2o_ice_s_dyn < 0.) h2o_ice_s_dyn = 0.
+min_h2o_ice_dyn(:,:,:) = minval(h2o_ice_s_dyn + watercap,4)
+write(*,*) "Computing the min of co2_ice..."
+where (co2_ice_slope_dyn < 0.) co2_ice_slope_dyn = 0.
 min_co2_ice_dyn(:,:,:) = minval(co2_ice_slope_dyn,4)
 
-!Compute averages
-write(*,*) "Computing average of tsurf"
+! Compute averages over the year for each point
+write(*,*) "Computing the average of tsurf..."
 tsurf_ave_dyn(:,:,:) = sum(tsurf_gcm_dyn(:,:,:,:),4)/timelen
 
@@ -203,5 +187,5 @@
     do islope = 1,nslope
         do t = 1,timelen
-            call gr_dyn_fi(1,iim_input+1,jjm_input+1,ngrid,watersurf_density_dyn(:,:,islope,t),watersurf_density(:,islope,t))
+            call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,watersurf_density_dyn(:,:,islope,t),watersurf_density(:,islope,t))
         enddo
     enddo
@@ -209,14 +193,13 @@
 
 if (soil_pem) then
-    write(*,*) "Computing average of tsoil"
+    write(*,*) "Computing average of tsoil..."
     tsoil_ave_dyn(:,:,:,:) = sum(tsoil_gcm_dyn(:,:,:,:,:),5)/timelen
-    write(*,*) "Computing average of watersurf_density"
+    write(*,*) "Computing average of waterdensity_surface..."
     watersurf_density_ave(:,:) = sum(watersurf_density(:,:,:),3)/timelen
 endif
 
-! By definition, a density is positive, we get rid of the negative values
-where (min_co2_ice_dyn < 0.) min_co2_ice_dyn = 0.
-where (min_h2o_ice_dyn < 0.) min_h2o_ice_dyn = 0.
-
+! By definition, we get rid of the negative values
+A = (1./m_co2 - 1./m_noco2)
+B = 1./m_noco2
 do i = 1,iim + 1
     do j = 1,jjm_input + 1
@@ -250,10 +233,10 @@
             do l = 1,nsoilmx
                 call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,tsoil_ave_dyn(:,:,l,islope),tsoil_ave(:,l,islope))
-                do t=1,timelen
+                do t = 1,timelen
                     call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,tsoil_gcm_dyn(:,:,l,islope,t),tsoil_gcm(:,l,islope,t))
                     call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,watersoil_density_dyn(:,:,l,islope,t),watersoil_density(:,l,islope,t))
                 enddo
             enddo
-        endif !soil_pem
+        endif ! soil_pem
         do t = 1,timelen
             call gr_dyn_fi(1,iim_input + 1,jjm_input + 1,ngrid,tsurf_GCM_dyn(:,:,islope,t),tsurf_GCM(:,islope,t))
@@ -274,5 +257,5 @@
         tsoil_gcm(1,:,:,:) = tsoil_gcm_dyn(1,1,:,:,:)
         watersoil_density(1,:,:,:) = watersoil_density_dyn(1,1,:,:,:)
-    endif !soil_pem
+    endif ! soil_pem
     tsurf_GCM(1,:,:) = tsurf_GCM_dyn(1,1,:,:)
     co2_ice_slope(1,:,:) = co2_ice_slope_dyn(1,1,:,:)
@@ -281,4 +264,6 @@
 
 END SUBROUTINE read_data_PCM
+
+!=======================================================================
 
 SUBROUTINE check_dim(n1,n2,str1,str2)
@@ -302,13 +287,13 @@
 !=======================================================================
 
-SUBROUTINE get_var1(var,v)
-
-implicit none
-
-character(len = *), intent(in)  :: var
+SUBROUTINE get_var1(filename,v)
+
+implicit none
+
+character(len = *), intent(in)  :: filename
 real, dimension(:), intent(out) :: v
 
-call error_msg(NF90_INQ_VARID(fID,var,vID),"inq",var)
-call error_msg(NF90_GET_VAR(fID,vID,v),"get",var)
+call error_msg(NF90_INQ_VARID(fID,filename,vID),"inq",filename)
+call error_msg(NF90_GET_VAR(fID,vID,v),"get",filename)
 
 END SUBROUTINE get_var1
@@ -316,13 +301,13 @@
 !=======================================================================
 
-SUBROUTINE get_var3(var,v) ! on U grid
-
-implicit none
-
-character(len = *),     intent(in)  :: var
+SUBROUTINE get_var3(filename,v) ! on U grid
+
+implicit none
+
+character(len = *),     intent(in)  :: filename
 real, dimension(:,:,:), intent(out) :: v
 
-call error_msg(NF90_INQ_VARID(fID,var,vID),"inq",var)
-call error_msg(NF90_GET_VAR(fID,vID,v),"get",var)
+call error_msg(NF90_INQ_VARID(fID,filename,vID),"inq",filename)
+call error_msg(NF90_GET_VAR(fID,vID,v),"get",filename)
 
 END SUBROUTINE get_var3
@@ -330,13 +315,13 @@
 !=======================================================================
 
-SUBROUTINE get_var4(var,v)
-
-implicit none
-
-character(len = *),       intent(in)  :: var
+SUBROUTINE get_var4(filename,v)
+
+implicit none
+
+character(len = *),       intent(in)  :: filename
 real, dimension(:,:,:,:), intent(out) :: v
 
-call error_msg(NF90_INQ_VARID(fID,var,vID),"inq",var)
-call error_msg(NF90_GET_VAR(fID,vID,v),"get",var)
+call error_msg(NF90_INQ_VARID(fID,filename,vID),"inq",filename)
+call error_msg(NF90_GET_VAR(fID,vID,v),"get",filename)
 
 END SUBROUTINE get_var4
Index: /trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90
===================================================================
--- /trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90	(revision 3121)
+++ /trunk/LMDZ.COMMON/libf/evolution/writediagpem.F90	(revision 3122)
@@ -32,5 +32,5 @@
 !         Oct 2011 Francois: enable having a 'diagpem.def' file to select
 !                            at runtime, which variables to put in file
-!         Oct 2023 JB: conversion into Fortran 90 with module for the PEM
+!         Oct 2023 JBC: conversion into Fortran 90 with module for the PEM
 !
 !  parametres (input) :
Index: /trunk/LMDZ.MARS/deftank/field_def_physics_mars.xml
===================================================================
--- /trunk/LMDZ.MARS/deftank/field_def_physics_mars.xml	(revision 3121)
+++ /trunk/LMDZ.MARS/deftank/field_def_physics_mars.xml	(revision 3122)
@@ -4,8 +4,8 @@
 <!-- =========================================================================================================== -->
 
-    <field_definition prec="4" 
+    <field_definition prec="4"
                       freq_op="1ts"
                       enabled=".TRUE.">
-        
+
         <!-- 0D variables -->
         <field_group id="fields_0D" grid_ref="scalarpoint">
@@ -150,5 +150,5 @@
                    unit="g" />
 
-        </field_group>    
+        </field_group>
 
         <field_group id="fields_controle" grid_ref="controle_grid">
@@ -171,5 +171,5 @@
         </field_group>
 
-        
+
         <!-- 2D variables -->
         <field_group id="fields_2D" domain_ref="dom_glo">
@@ -178,60 +178,60 @@
                    unit="m2" />
             <field id="phisfi"
-                   long_name="Surface geopotential"  
+                   long_name="Surface geopotential"
                    unit="m2.s-2" />
             <field id="emis"
-                   long_name="Surface emissivity"  
+                   long_name="Surface emissivity"
                    unit="" />
             <field id="emis_slope01"
-                   long_name="Surface emissivity of slope 01"  
+                   long_name="Surface emissivity of slope 01"
                    unit="" />
             <field id="emis_slope02"
-                   long_name="Surface emissivity of slope 02"  
+                   long_name="Surface emissivity of slope 02"
                    unit="" />
             <field id="emis_slope03"
-                   long_name="Surface emissivity of slope 03"  
+                   long_name="Surface emissivity of slope 03"
                    unit="" />
             <field id="emis_slope04"
-                   long_name="Surface emissivity of slope 04"  
+                   long_name="Surface emissivity of slope 04"
                    unit="" />
             <field id="emis_slope05"
-                   long_name="Surface emissivity of slope 05"  
+                   long_name="Surface emissivity of slope 05"
                    unit="" />
             <field id="emis_slope06"
-                   long_name="Surface emissivity of slope 06"  
+                   long_name="Surface emissivity of slope 06"
                    unit="" />
             <field id="emis_slope07"
-                   long_name="Surface emissivity of slope 07"  
+                   long_name="Surface emissivity of slope 07"
                    unit="" />
             <field id="albedo"
-                   long_name="Albedo of the surface"  
+                   long_name="Albedo of the surface"
                    unit="" />
             <field id="albedo_slope01"
-                   long_name="Albedo of the surface for slope 01"  
+                   long_name="Albedo of the surface for slope 01"
                    unit="" />
             <field id="albedo_slope02"
-                   long_name="Albedo of the surface for slope 02"  
+                   long_name="Albedo of the surface for slope 02"
                    unit="" />
             <field id="albedo_slope03"
-                   long_name="Albedo of the surface for slope 03"  
+                   long_name="Albedo of the surface for slope 03"
                    unit="" />
             <field id="albedo_slope04"
-                   long_name="Albedo of the surface for slope 04"  
+                   long_name="Albedo of the surface for slope 04"
                    unit="" />
             <field id="albedo_slope05"
-                   long_name="Albedo of the surface for slope 05"  
+                   long_name="Albedo of the surface for slope 05"
                    unit="" />
             <field id="albedo_slope06"
-                   long_name="Albedo of the surface for slope 06"  
+                   long_name="Albedo of the surface for slope 06"
                    unit="" />
             <field id="albedo_slope07"
-                   long_name="Albedo of the surface for slope 07"  
+                   long_name="Albedo of the surface for slope 07"
                    unit="" />
             <field id="local_time"
-                   long_name="Local time" 
+                   long_name="Local time"
                    unit="sol" />
 
             <field id="ps"
-                   long_name="Surface Pressure" 
+                   long_name="Surface Pressure"
                    unit="Pa" />
             <field id="tsurf"
@@ -268,63 +268,63 @@
             <!-- Radiation -->
             <field id="fluxsurf_lw"
-                   long_name="Longwave radiation at the surface" 
+                   long_name="Longwave radiation at the surface"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope01"
-                   long_name="Longwave radiation at the surface on slope 01" 
+                   long_name="Longwave radiation at the surface on slope 01"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope02"
-                   long_name="Longwave radiation at the surface on slope 02" 
+                   long_name="Longwave radiation at the surface on slope 02"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope03"
-                   long_name="Longwave radiation at the surface on slope 03" 
+                   long_name="Longwave radiation at the surface on slope 03"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope04"
-                   long_name="Longwave radiation at the surface on slope 04" 
+                   long_name="Longwave radiation at the surface on slope 04"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope05"
-                   long_name="Longwave radiation at the surface on slope 05" 
+                   long_name="Longwave radiation at the surface on slope 05"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope06"
-                   long_name="Longwave radiation at the surface on slope 06" 
+                   long_name="Longwave radiation at the surface on slope 06"
                    unit="W.m-2" />
             <field id="fluxsurf_lw_slope07"
-                   long_name="Longwave radiation at the surface on slope 07" 
+                   long_name="Longwave radiation at the surface on slope 07"
                    unit="W.m-2" />
 
             <field id="fluxtop_lw"
-                   long_name="Longwave radiation at the top of the atmosphere" 
+                   long_name="Longwave radiation at the top of the atmosphere"
                    unit="W.m-2" />
             <field id="fluxtop_dn_sw"
-                   long_name="Incoming shortwave radiation at the top of the atmosphere" 
+                   long_name="Incoming shortwave radiation at the top of the atmosphere"
                    unit="W.m-2" />
             <field id="fluxtop_up_sw"
-                   long_name="Upward shortwave radiation at the top of the atmosphere" 
+                   long_name="Upward shortwave radiation at the top of the atmosphere"
                    unit="W.m-2" />
 
             <field id="fluxsurf_dn_sw"
-                   long_name="Incoming shortwave radiation at the surface"  
+                   long_name="Incoming shortwave radiation at the surface"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope01"
-                   long_name="Incoming shortwave radiation at the surface on slope 01"  
+                   long_name="Incoming shortwave radiation at the surface on slope 01"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope02"
-                   long_name="Incoming shortwave radiation at the surface on slope 02"  
+                   long_name="Incoming shortwave radiation at the surface on slope 02"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope03"
-                   long_name="Incoming shortwave radiation at the surface on slope 03"  
+                   long_name="Incoming shortwave radiation at the surface on slope 03"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope04"
-                   long_name="Incoming shortwave radiation at the surface on slope 04"  
+                   long_name="Incoming shortwave radiation at the surface on slope 04"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope05"
-                   long_name="Incoming shortwave radiation at the surface on slope 05"  
+                   long_name="Incoming shortwave radiation at the surface on slope 05"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope06"
-                   long_name="Incoming shortwave radiation at the surface on slope 06"  
+                   long_name="Incoming shortwave radiation at the surface on slope 06"
                    unit="W.m-2" />
             <field id="fluxsurf_dn_sw_slope07"
-                   long_name="Incoming shortwave radiation at the surface on slope 07"  
-                   unit="W.m-2" />
-            
+                   long_name="Incoming shortwave radiation at the surface on slope 07"
+                   unit="W.m-2" />
+
             <!-- dust cycle -->
             <field id="tau_pref_scenario"
@@ -409,5 +409,5 @@
                    long_name="dust injection rate"
                    unit="s-1" />
-            
+
             <field id="stormfract"
                    long_name="fraction of the mesh with stormdust"
@@ -429,8 +429,8 @@
             <field id="watercap"
                    long_name="Perennial water ice thickness"
-                   unit="kg.m-2" />            
+                   unit="kg.m-2" />
             <field id="watercap_slope01"
                    long_name="Perennial water ice thickness of slope 01"
-                   unit="kg.m-2" />  
+                   unit="kg.m-2" />
             <field id="watercap_slope02"
                    long_name="Perennial water ice thickness of slope 02"
@@ -451,5 +451,5 @@
                    long_name="Perennial water ice thickness of slope 07"
                    unit="kg/m2" />
-    
+
             <field id="surf_h2o_lh"
                    long_name="Ground ice latent heat flux"
@@ -503,37 +503,37 @@
                    long_name="Mass of water ice on the surface of slope 07"
                    unit="kg/m2" />
-            <field id="Waterdensity_surface"
-                   long_name="Waterdensity_surface"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface01"
-                   long_name="Waterdensity_surface of slope 01"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface02"
-                   long_name="Waterdensity_surface of slope 02"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface03"
-                   long_name="Waterdensity_surface of slope 03"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface04"
-                   long_name="Waterdensity_surface of slope 04"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface05"
-                   long_name="Waterdensity_surface of slope 05"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface06"
-                   long_name="Waterdensity_surface of slope 06"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_surface07"
-                   long_name="Waterdensity_surface of slope 07"
+            <field id="waterdensity_surface"
+                   long_name="waterdensity_surface"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface01"
+                   long_name="waterdensity_surface of slope 01"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface02"
+                   long_name="waterdensity_surface of slope 02"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface03"
+                   long_name="waterdensity_surface of slope 03"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface04"
+                   long_name="waterdensity_surface of slope 04"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface05"
+                   long_name="waterdensity_surface of slope 05"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface06"
+                   long_name="waterdensity_surface of slope 06"
+                   unit="kg.m-3" />
+            <field id="waterdensity_surface07"
+                   long_name="waterdensity_surface of slope 07"
                    unit="kg.m-3" />
             <field id="h2o_layer1"
-                   long_name="h2o in the first layer"  
+                   long_name="h2o in the first layer"
                    unit="kg/kg" />
             <field id="co2_layer1"
-                   long_name="co2 in the first layer"  
-                   unit="kg/kg" />
-
-
-            
+                   long_name="co2 in the first layer"
+                   unit="kg/kg" />
+
+
+
             <!-- CO2 cycle -->
             <field id="co2ice"
@@ -567,116 +567,116 @@
 
             <!-- tracer columns (chemistry) -->
-            <field id="c_co2" 
-                   long_name="CO2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_co" 
-                   long_name="CO column" 
-                   unit="mol.cm-2" />
-            <field id="c_o" 
-                   long_name="O column" 
-                   unit="mol.cm-2" />
-            <field id="c_o1d" 
-                   long_name="O1d column" 
-                   unit="mol.cm-2" />
-            <field id="c_o2" 
-                   long_name="O2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_o3" 
-                   long_name="O3 column" 
-                   unit="mol.cm-2" />
-            <field id="c_h" 
-                   long_name="H column" 
-                   unit="mol.cm-2" />
-            <field id="c_h2" 
-                   long_name="H2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_oh" 
-                   long_name="OH column" 
-                   unit="mol.cm-2" />
-            <field id="c_ho2" 
-                   long_name="HO2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_h2o2" 
-                   long_name="H2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_n2" 
-                   long_name="N2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_ar" 
-                   long_name="Ar column" 
-                   unit="mol.cm-2" />
-            <field id="c_h2o_ice" 
-                   long_name="H2O_ice column" 
-                   unit="mol.cm-2" />
-            <field id="c_h2o_vap" 
-                   long_name="H2O_vap column" 
-                   unit="mol.cm-2" />
-            <field id="c_n" 
-                   long_name="N column" 
-                   unit="mol.cm-2" />
-            <field id="c_no" 
-                   long_name="NO column" 
-                   unit="mol.cm-2" />
-            <field id="c_no2" 
-                   long_name="NO2 column" 
-                   unit="mol.cm-2" />
-            <field id="c_n2d" 
-                   long_name="N2d column" 
-                   unit="mol.cm-2" />
-            <field id="c_ch4" 
-                   long_name="CH4 column" 
-                   unit="mol.cm-2" />
-            <field id="c_he" 
-                   long_name="He column" 
+            <field id="c_co2"
+                   long_name="CO2 column"
+                   unit="mol.cm-2" />
+            <field id="c_co"
+                   long_name="CO column"
+                   unit="mol.cm-2" />
+            <field id="c_o"
+                   long_name="O column"
+                   unit="mol.cm-2" />
+            <field id="c_o1d"
+                   long_name="O1d column"
+                   unit="mol.cm-2" />
+            <field id="c_o2"
+                   long_name="O2 column"
+                   unit="mol.cm-2" />
+            <field id="c_o3"
+                   long_name="O3 column"
+                   unit="mol.cm-2" />
+            <field id="c_h"
+                   long_name="H column"
+                   unit="mol.cm-2" />
+            <field id="c_h2"
+                   long_name="H2 column"
+                   unit="mol.cm-2" />
+            <field id="c_oh"
+                   long_name="OH column"
+                   unit="mol.cm-2" />
+            <field id="c_ho2"
+                   long_name="HO2 column"
+                   unit="mol.cm-2" />
+            <field id="c_h2o2"
+                   long_name="H2 column"
+                   unit="mol.cm-2" />
+            <field id="c_n2"
+                   long_name="N2 column"
+                   unit="mol.cm-2" />
+            <field id="c_ar"
+                   long_name="Ar column"
+                   unit="mol.cm-2" />
+            <field id="c_h2o_ice"
+                   long_name="H2O_ice column"
+                   unit="mol.cm-2" />
+            <field id="c_h2o_vap"
+                   long_name="H2O_vap column"
+                   unit="mol.cm-2" />
+            <field id="c_n"
+                   long_name="N column"
+                   unit="mol.cm-2" />
+            <field id="c_no"
+                   long_name="NO column"
+                   unit="mol.cm-2" />
+            <field id="c_no2"
+                   long_name="NO2 column"
+                   unit="mol.cm-2" />
+            <field id="c_n2d"
+                   long_name="N2d column"
+                   unit="mol.cm-2" />
+            <field id="c_ch4"
+                   long_name="CH4 column"
+                   unit="mol.cm-2" />
+            <field id="c_he"
+                   long_name="He column"
                    unit="mol.cm-2" />
 
             <!-- ions -->
-            <field id="c_co2plus" 
-                   long_name="CO2+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_oplus" 
-                   long_name="O+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_o2plus" 
-                   long_name="O2+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_coplus" 
-                   long_name="CO+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_coplus" 
-                   long_name="CO+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_cplus" 
-                   long_name="C+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_nplus" 
-                   long_name="N+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_noplus" 
-                   long_name="NO+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_n2plus" 
-                   long_name="N2+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_hplus" 
-                   long_name="H+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_hco2plus" 
-                   long_name="HCO2+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_hcoplus" 
-                   long_name="HCO+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_h2oplus" 
-                   long_name="H2O+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_h3oplus" 
-                   long_name="H3O+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_ohplus" 
-                   long_name="OH+ column" 
-                   unit="mol.cm-2" />
-            <field id="c_elec" 
-                   long_name="electron column" 
+            <field id="c_co2plus"
+                   long_name="CO2+ column"
+                   unit="mol.cm-2" />
+            <field id="c_oplus"
+                   long_name="O+ column"
+                   unit="mol.cm-2" />
+            <field id="c_o2plus"
+                   long_name="O2+ column"
+                   unit="mol.cm-2" />
+            <field id="c_coplus"
+                   long_name="CO+ column"
+                   unit="mol.cm-2" />
+            <field id="c_coplus"
+                   long_name="CO+ column"
+                   unit="mol.cm-2" />
+            <field id="c_cplus"
+                   long_name="C+ column"
+                   unit="mol.cm-2" />
+            <field id="c_nplus"
+                   long_name="N+ column"
+                   unit="mol.cm-2" />
+            <field id="c_noplus"
+                   long_name="NO+ column"
+                   unit="mol.cm-2" />
+            <field id="c_n2plus"
+                   long_name="N2+ column"
+                   unit="mol.cm-2" />
+            <field id="c_hplus"
+                   long_name="H+ column"
+                   unit="mol.cm-2" />
+            <field id="c_hco2plus"
+                   long_name="HCO2+ column"
+                   unit="mol.cm-2" />
+            <field id="c_hcoplus"
+                   long_name="HCO+ column"
+                   unit="mol.cm-2" />
+            <field id="c_h2oplus"
+                   long_name="H2O+ column"
+                   unit="mol.cm-2" />
+            <field id="c_h3oplus"
+                   long_name="H3O+ column"
+                   unit="mol.cm-2" />
+            <field id="c_ohplus"
+                   long_name="OH+ column"
+                   unit="mol.cm-2" />
+            <field id="c_elec"
+                   long_name="electron column"
                    unit="mol.cm-2" />
 
@@ -734,395 +734,395 @@
                    long_name="Eastward Zonal Wind"
                    unit="m.s-1" />
-            <field id="v" 
-                   long_name="Northward Meridional Wind" 
+            <field id="v"
+                   long_name="Northward Meridional Wind"
                    unit="m.s-1" />
-            <field id="w" 
-                   long_name="Vertical Wind (positive when downward)" 
+            <field id="w"
+                   long_name="Vertical Wind (positive when downward)"
                    unit="m.s-1" />
-            <field id="rho" 
-                   long_name="Atmospheric density" 
-                   unit="kg.m-3" />
-            <field id="pressure" 
-                   long_name="Atmospheric pressure" 
+            <field id="rho"
+                   long_name="Atmospheric density"
+                   unit="kg.m-3" />
+            <field id="pressure"
+                   long_name="Atmospheric pressure"
                    unit="Pa" />
-            <field id="zplev" 
-                   long_name="Interlayer pressure" 
+            <field id="zplev"
+                   long_name="Interlayer pressure"
                    unit="Pa" />
 
             <!-- heating rates -->
-            <field id="dtrad" 
-                   long_name="total radiative heating rate" 
+            <field id="dtrad"
+                   long_name="total radiative heating rate"
                    unit="K.s-1" />
-            <field id="sw_htrt" 
-                   long_name="Shortwave heating rate" 
+            <field id="sw_htrt"
+                   long_name="Shortwave heating rate"
                    unit="K.s-1" />
-            <field id="lw_htrt" 
-                   long_name="Longwave heating rate" 
+            <field id="lw_htrt"
+                   long_name="Longwave heating rate"
                    unit="K.s-1" />
-            <field id="q15um" 
-                   long_name="15 um cooling" 
+            <field id="q15um"
+                   long_name="15 um cooling"
                    unit="K.s-1" />
-            <field id="qnir" 
-                   long_name="NIR heating rate" 
+            <field id="qnir"
+                   long_name="NIR heating rate"
                    unit="K.s-1" />
-            <field id="quv" 
-                   long_name="EUV heating rate" 
+            <field id="quv"
+                   long_name="EUV heating rate"
                    unit="K.s-1" />
-            <field id="cond" 
-                   long_name="Thermal conduction heating rate" 
+            <field id="cond"
+                   long_name="Thermal conduction heating rate"
                    unit="K.s-1" />
 
             <!-- tracers (CO2 and water) -->
-            <field id="co2" 
-                   long_name="CO2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_co2" 
-                   long_name="CO2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_co2" 
-                   long_name="CO2 number density" 
-                   unit="cm-3" />
-            <field id="h2o_ice" 
-                   long_name="water ice mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_h2oice" 
-                   long_name="water ice volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="vmr_h2o_ice" 
-                   long_name="water ice volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_h2o_ice" 
-                   long_name="water ice number density" 
-                   unit="cm-3" />
-            <field id="h2o_vap" 
-                   long_name="water vapor mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_h2ovap" 
-                   long_name="water vapor volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="vmr_h2o_vap" 
-                   long_name="water vapor volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_h2o_vap" 
-                   long_name="water vapor number density" 
-                   unit="cm-3" />
-       
+            <field id="co2"
+                   long_name="CO2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_co2"
+                   long_name="CO2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_co2"
+                   long_name="CO2 number density"
+                   unit="cm-3" />
+            <field id="h2o_ice"
+                   long_name="water ice mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_h2oice"
+                   long_name="water ice volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="vmr_h2o_ice"
+                   long_name="water ice volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_h2o_ice"
+                   long_name="water ice number density"
+                   unit="cm-3" />
+            <field id="h2o_vap"
+                   long_name="water vapor mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_h2ovap"
+                   long_name="water vapor volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="vmr_h2o_vap"
+                   long_name="water vapor volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_h2o_vap"
+                   long_name="water vapor number density"
+                   unit="cm-3" />
+
             <!-- tracers (chemistry) -->
-            <field id="co" 
-                   long_name="CO mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_co" 
-                   long_name="CO volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_co" 
-                   long_name="CO number density" 
-                   unit="cm-3" />
-            <field id="o" 
-                   long_name="O mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_o" 
-                   long_name="O volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_o" 
-                   long_name="O number density" 
-                   unit="cm-3" />
-            <field id="o1d" 
-                   long_name="O1d mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_o1d" 
-                   long_name="O1d volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_o1d" 
-                   long_name="O1d number density" 
-                   unit="cm-3" />
-            <field id="o2" 
-                   long_name="O2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_o2" 
-                   long_name="O2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_o2" 
-                   long_name="O2 number density" 
-                   unit="cm-3" />
-            <field id="o3" 
-                   long_name="O3 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_o3" 
-                   long_name="O3 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_o3" 
-                   long_name="O3 number density" 
-                   unit="cm-3" />
-            <field id="h" 
-                   long_name="H mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_h" 
-                   long_name="H volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_h" 
-                   long_name="H number density" 
-                   unit="cm-3" />
-            <field id="h2" 
-                   long_name="H2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_h2" 
-                   long_name="H2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_h2" 
-                   long_name="H2 number density" 
-                   unit="cm-3" />
-            <field id="oh" 
-                   long_name="OH mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_oh" 
-                   long_name="OH volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_oh" 
-                   long_name="OH number density" 
-                   unit="cm-3" />
-            <field id="ho2" 
-                   long_name="HO2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_ho2" 
-                   long_name="HO2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_ho2" 
-                   long_name="HO2 number density" 
-                   unit="cm-3" />
-            <field id="h2o2" 
-                   long_name="H2O2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_h2o2" 
-                   long_name="H2O2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_h2o2" 
-                   long_name="H2O2 number density" 
-                   unit="cm-3" />
-            <field id="n2" 
-                   long_name="N2 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_n2" 
-                   long_name="N2 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_n2" 
-                   long_name="N2 number density" 
-                   unit="cm-3" />
-            <field id="ar" 
-                   long_name="Ar mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_ar" 
-                   long_name="Ar volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_ar" 
-                   long_name="Ar number density" 
-                   unit="cm-3" />
-            <field id="num_n" 
-                   long_name="N number density" 
-                   unit="cm-3" />
-            <field id="num_no" 
-                   long_name="NO number density" 
-                   unit="cm-3" />
-            <field id="num_no2" 
-                   long_name="NO2 number density" 
-                   unit="cm-3" />
-            <field id="num_n2d" 
-                   long_name="N2d number density" 
-                   unit="cm-3" />
-            <field id="ch4" 
-                   long_name="CH4 mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_ch4" 
-                   long_name="CH4 volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_ch4" 
-                   long_name="CH4 number density" 
-                   unit="cm-3" />
-            <field id="he" 
-                   long_name="He mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="vmr_he" 
-                   long_name="He volume mixing ratio" 
-                   unit="mol/mol" />
-            <field id="num_he" 
-                   long_name="He number density" 
+            <field id="co"
+                   long_name="CO mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_co"
+                   long_name="CO volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_co"
+                   long_name="CO number density"
+                   unit="cm-3" />
+            <field id="o"
+                   long_name="O mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_o"
+                   long_name="O volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_o"
+                   long_name="O number density"
+                   unit="cm-3" />
+            <field id="o1d"
+                   long_name="O1d mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_o1d"
+                   long_name="O1d volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_o1d"
+                   long_name="O1d number density"
+                   unit="cm-3" />
+            <field id="o2"
+                   long_name="O2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_o2"
+                   long_name="O2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_o2"
+                   long_name="O2 number density"
+                   unit="cm-3" />
+            <field id="o3"
+                   long_name="O3 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_o3"
+                   long_name="O3 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_o3"
+                   long_name="O3 number density"
+                   unit="cm-3" />
+            <field id="h"
+                   long_name="H mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_h"
+                   long_name="H volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_h"
+                   long_name="H number density"
+                   unit="cm-3" />
+            <field id="h2"
+                   long_name="H2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_h2"
+                   long_name="H2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_h2"
+                   long_name="H2 number density"
+                   unit="cm-3" />
+            <field id="oh"
+                   long_name="OH mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_oh"
+                   long_name="OH volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_oh"
+                   long_name="OH number density"
+                   unit="cm-3" />
+            <field id="ho2"
+                   long_name="HO2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_ho2"
+                   long_name="HO2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_ho2"
+                   long_name="HO2 number density"
+                   unit="cm-3" />
+            <field id="h2o2"
+                   long_name="H2O2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_h2o2"
+                   long_name="H2O2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_h2o2"
+                   long_name="H2O2 number density"
+                   unit="cm-3" />
+            <field id="n2"
+                   long_name="N2 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_n2"
+                   long_name="N2 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_n2"
+                   long_name="N2 number density"
+                   unit="cm-3" />
+            <field id="ar"
+                   long_name="Ar mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_ar"
+                   long_name="Ar volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_ar"
+                   long_name="Ar number density"
+                   unit="cm-3" />
+            <field id="num_n"
+                   long_name="N number density"
+                   unit="cm-3" />
+            <field id="num_no"
+                   long_name="NO number density"
+                   unit="cm-3" />
+            <field id="num_no2"
+                   long_name="NO2 number density"
+                   unit="cm-3" />
+            <field id="num_n2d"
+                   long_name="N2d number density"
+                   unit="cm-3" />
+            <field id="ch4"
+                   long_name="CH4 mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_ch4"
+                   long_name="CH4 volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_ch4"
+                   long_name="CH4 number density"
+                   unit="cm-3" />
+            <field id="he"
+                   long_name="He mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="vmr_he"
+                   long_name="He volume mixing ratio"
+                   unit="mol/mol" />
+            <field id="num_he"
+                   long_name="He number density"
                    unit="cm-3" />
 
             <!-- ions -->
-            <field id="num_co2plus" 
-                   long_name="CO2+ number density" 
-                   unit="cm-3" />
-            <field id="num_oplus" 
-                   long_name="O+ number density" 
-                   unit="cm-3" />
-            <field id="num_o2plus" 
-                   long_name="O2+ number density" 
-                   unit="cm-3" />
-            <field id="num_coplus" 
-                   long_name="CO+ number density" 
-                   unit="cm-3" />
-            <field id="num_coplus" 
-                   long_name="CO+ number density" 
-                   unit="cm-3" />
-            <field id="num_cplus" 
-                   long_name="C+ number density" 
-                   unit="cm-3" />
-            <field id="num_nplus" 
-                   long_name="N+ number density" 
-                   unit="cm-3" />
-            <field id="num_noplus" 
-                   long_name="NO+ number density" 
-                   unit="cm-3" />
-            <field id="num_n2plus" 
-                   long_name="N2+ number density" 
-                   unit="cm-3" />
-            <field id="num_hplus" 
-                   long_name="H+ number density" 
-                   unit="cm-3" />
-            <field id="num_hco2plus" 
-                   long_name="HCO2+ number density" 
-                   unit="cm-3" />
-            <field id="num_hcoplus" 
-                   long_name="HCO+ number density" 
-                   unit="cm-3" />
-            <field id="num_h2oplus" 
-                   long_name="H2O+ number density" 
-                   unit="cm-3" />
-            <field id="num_h3oplus" 
-                   long_name="H3O+ number density" 
-                   unit="cm-3" />
-            <field id="num_ohplus" 
-                   long_name="OH+ number density" 
-                   unit="cm-3" />
-            <field id="num_elec" 
-                   long_name="electron number density" 
+            <field id="num_co2plus"
+                   long_name="CO2+ number density"
+                   unit="cm-3" />
+            <field id="num_oplus"
+                   long_name="O+ number density"
+                   unit="cm-3" />
+            <field id="num_o2plus"
+                   long_name="O2+ number density"
+                   unit="cm-3" />
+            <field id="num_coplus"
+                   long_name="CO+ number density"
+                   unit="cm-3" />
+            <field id="num_coplus"
+                   long_name="CO+ number density"
+                   unit="cm-3" />
+            <field id="num_cplus"
+                   long_name="C+ number density"
+                   unit="cm-3" />
+            <field id="num_nplus"
+                   long_name="N+ number density"
+                   unit="cm-3" />
+            <field id="num_noplus"
+                   long_name="NO+ number density"
+                   unit="cm-3" />
+            <field id="num_n2plus"
+                   long_name="N2+ number density"
+                   unit="cm-3" />
+            <field id="num_hplus"
+                   long_name="H+ number density"
+                   unit="cm-3" />
+            <field id="num_hco2plus"
+                   long_name="HCO2+ number density"
+                   unit="cm-3" />
+            <field id="num_hcoplus"
+                   long_name="HCO+ number density"
+                   unit="cm-3" />
+            <field id="num_h2oplus"
+                   long_name="H2O+ number density"
+                   unit="cm-3" />
+            <field id="num_h3oplus"
+                   long_name="H3O+ number density"
+                   unit="cm-3" />
+            <field id="num_ohplus"
+                   long_name="OH+ number density"
+                   unit="cm-3" />
+            <field id="num_elec"
+                   long_name="electron number density"
                    unit="cm-3" />
 
             <!-- Dust cycle parametrization -->
-            <field id="reffdust" 
-                   long_name="Dust effective radius" 
+            <field id="reffdust"
+                   long_name="Dust effective radius"
                    unit="m" />
-            <field id="rdust" 
-                   long_name="Dust radius" 
+            <field id="rdust"
+                   long_name="Dust radius"
                    unit="m" />
-            <field id="dustq" 
-                   long_name="Dust mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="dustN" 
-                   long_name="Dust number mixing ratio" 
+            <field id="dustq"
+                   long_name="Dust mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="dustN"
+                   long_name="Dust number mixing ratio"
                    unit="part/kg" />
-            <field id="dsodust_TES" 
-                   long_name="Density scaled extinction opacity of std dust at 9.3um(TES)" 
+            <field id="dsodust_TES"
+                   long_name="Density scaled extinction opacity of std dust at 9.3um(TES)"
                    unit="m2.kg-1" />
-            <field id="dso_TES" 
-                   long_name="Density scaled extinction opacity of all dust at 9.3um(TES)" 
+            <field id="dso_TES"
+                   long_name="Density scaled extinction opacity of all dust at 9.3um(TES)"
                    unit="m2.kg-1" />
-            <field id="dsodust" 
-                   long_name="Density scaled extinction opacity of std dust at 21.6um(MCS)" 
+            <field id="dsodust"
+                   long_name="Density scaled extinction opacity of std dust at 21.6um(MCS)"
                    unit="m2.kg-1" />
-            <field id="dso" 
-                   long_name="Density scaled extinction opacity of all dust at 21.6um(MCS)" 
+            <field id="dso"
+                   long_name="Density scaled extinction opacity of all dust at 21.6um(MCS)"
                    unit="m2.kg-1" />
-            <field id="aerosol_dust" 
-                   long_name="Opacity of background dust" 
-                   unit="" />
-
-            <field id="reffstormdust" 
-                   long_name="Stormdust dust effective radius" 
+            <field id="aerosol_dust"
+                   long_name="Opacity of background dust"
+                   unit="" />
+
+            <field id="reffstormdust"
+                   long_name="Stormdust dust effective radius"
                    unit="m" />
-            <field id="rstormdust" 
-                   long_name="Stormdust dust radius" 
+            <field id="rstormdust"
+                   long_name="Stormdust dust radius"
                    unit="m" />
-            <field id="dsords_TES" 
-                   long_name="Density scaled extinction opacity of stormdust at 9.3um(TES)" 
+            <field id="dsords_TES"
+                   long_name="Density scaled extinction opacity of stormdust at 9.3um(TES)"
                    unit="m2.kg-1" />
-            <field id="dsords" 
-                   long_name="Density scaled extinction opacity of stormdust at 21.6um(MCS)" 
+            <field id="dsords"
+                   long_name="Density scaled extinction opacity of stormdust at 21.6um(MCS)"
                    unit="m2.kg-1" />
-            <field id="rdsdustq" 
-                   long_name="Stormdust dust mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="rdsdustqmodel" 
-                   long_name="Stormdust dust mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="rdsdustN" 
-                   long_name="Stormdust dust number mixing ratio" 
+            <field id="rdsdustq"
+                   long_name="Stormdust dust mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="rdsdustqmodel"
+                   long_name="Stormdust dust mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="rdsdustN"
+                   long_name="Stormdust dust number mixing ratio"
                    unit="part/kg" />
-            <field id="rdsdustN" 
-                   long_name="Stormdust dust number mixing ratio" 
+            <field id="rdsdustN"
+                   long_name="Stormdust dust number mixing ratio"
                    unit="part/kg" />
-            <field id="wspeed_stormdust" 
-                   long_name="vertical velocity of stormdust" 
+            <field id="wspeed_stormdust"
+                   long_name="vertical velocity of stormdust"
                    unit="m/s" />
-            <field id="zdqsed_dust_mass" 
-                   long_name="sedimentation tendency of background dust mmr" 
+            <field id="zdqsed_dust_mass"
+                   long_name="sedimentation tendency of background dust mmr"
                    unit="kg/kg.s-1" />
-            <field id="zdqsed_dust_number" 
-                   long_name="sedimentation tendency of background dust number" 
+            <field id="zdqsed_dust_number"
+                   long_name="sedimentation tendency of background dust number"
                    unit="nbr/kg.s-1" />
-            <field id="zdqsed_stormdust_mass" 
-                   long_name="sedimentation tendency of stormdust dust mmr" 
+            <field id="zdqsed_stormdust_mass"
+                   long_name="sedimentation tendency of stormdust dust mmr"
                    unit="kg/kg.s-1" />
-            <field id="aerosol_stormdust" 
-                   long_name="Opacity of stormdust dust" 
-                   unit="" />
-            <field id="rds_lapserate" 
-                   long_name="lapse rate in the rocket dust storm" 
+            <field id="aerosol_stormdust"
+                   long_name="Opacity of stormdust dust"
+                   unit="" />
+            <field id="rds_lapserate"
+                   long_name="lapse rate in the rocket dust storm"
                    unit="K/m" />
-            <field id="rds_deltahr" 
-                   long_name="extra heating rate in the rocket dust storm" 
+            <field id="rds_deltahr"
+                   long_name="extra heating rate in the rocket dust storm"
                    unit="K/s" />
 
-            <field id="topdustq" 
-                   long_name="Topdust dust mass mixing ratio" 
-                   unit="kg/kg" />
-            <field id="topdustN" 
-                   long_name="Topdust dust number mixing ratio" 
+            <field id="topdustq"
+                   long_name="Topdust dust mass mixing ratio"
+                   unit="kg/kg" />
+            <field id="topdustN"
+                   long_name="Topdust dust number mixing ratio"
                    unit="part/kg" />
-            <field id="refftopdust" 
-                   long_name="Topdust dust effective radius" 
+            <field id="refftopdust"
+                   long_name="Topdust dust effective radius"
                    unit="m" />
-            <field id="dsotop_TES" 
-                   long_name="Density scaled extinction opacity of topdust at 9.3um(TES)" 
+            <field id="dsotop_TES"
+                   long_name="Density scaled extinction opacity of topdust at 9.3um(TES)"
                    unit="m2.kg-1" />
-            <field id="dsotop" 
-                   long_name="Density scaled extinction opacity of topdust at 21.6um(MCS)" 
+            <field id="dsotop"
+                   long_name="Density scaled extinction opacity of topdust at 21.6um(MCS)"
                    unit="m2.kg-1" />
 
 
             <!-- Water cycle parametrization -->
-            <field id="rice" 
-                   long_name="Water ice particle size" 
+            <field id="rice"
+                   long_name="Water ice particle size"
                    unit="m" />
-            <field id="h2o_saturation" 
-                   long_name="h2o vapor saturation ratio" 
-                   unit="" />
-            <field id="watercloud_pdqh2oice" 
-                   long_name="pdqcloud_h2o_ice after microphysics" 
+            <field id="h2o_saturation"
+                   long_name="h2o vapor saturation ratio"
+                   unit="" />
+            <field id="watercloud_pdqh2oice"
+                   long_name="pdqcloud_h2o_ice after microphysics"
                    unit="kg/kg.s-1" />
-            <field id="watercloud_pdqh2ovap" 
-                   long_name="pdqcloud_h2o_vap after microphysics" 
+            <field id="watercloud_pdqh2ovap"
+                   long_name="pdqcloud_h2o_vap after microphysics"
                    unit="kg/kg.s-1" />
-            <field id="watercloud_pdqhdoice" 
-                   long_name="pdqcloud_hdo_ice after microphysics" 
+            <field id="watercloud_pdqhdoice"
+                   long_name="pdqcloud_hdo_ice after microphysics"
                    unit="kg/kg.s-1" />
-            <field id="watercloud_pdqhdovap" 
-                   long_name="pdqcloud_hdo_vap after microphysics" 
+            <field id="watercloud_pdqhdovap"
+                   long_name="pdqcloud_hdo_vap after microphysics"
                    unit="kg/kg.s-1" />
-            
-            <field id="zpotcond_inst" 
-                   long_name="zpotcond_inst microphysics" 
+
+            <field id="zpotcond_inst"
+                   long_name="zpotcond_inst microphysics"
                    unit="(kg/kg)" />
-            <field id="zpotcond_full" 
-                   long_name="zpotcond_full microphysics" 
+            <field id="zpotcond_full"
+                   long_name="zpotcond_full microphysics"
                    unit="(kg/kg)" />
-            <field id="zpotcond" 
-                   long_name="zpotcond microphysics" 
+            <field id="zpotcond"
+                   long_name="zpotcond microphysics"
                    unit="(kg/kg)" />
-            <field id="count_micro" 
-                   long_name="count_micro after microphysics" 
+            <field id="count_micro"
+                   long_name="count_micro after microphysics"
                    unit="integer" />
 
-            <field id="zdqcloud_ice" 
-                   long_name="cloud ice" 
+            <field id="zdqcloud_ice"
+                   long_name="cloud ice"
                    unit="kg.m-2.s-1" />
             <field id="zdqcloud_vap"
@@ -1134,25 +1134,25 @@
 
             <!-- CO2 condensation parametrization -->
-            <field id="co2condens_pdtc" 
-                   long_name="Temperature tendency due to CO2 condensation" 
+            <field id="co2condens_pdtc"
+                   long_name="Temperature tendency due to CO2 condensation"
                    unit="K.s-1" />
-            
+
             <!-- Non-orographic GW parametrization -->
-            <field id="nonoro_bv" 
-                   long_name="Brunt Vaisala frequency in nonoro" 
+            <field id="nonoro_bv"
+                   long_name="Brunt Vaisala frequency in nonoro"
                    unit="Hz" />
-            <field id="nonoro_u_epflux_tot" 
-                   long_name="Total EP Flux along U in nonoro" 
-                   unit="" />
-            <field id="nonoro_v_epflux_tot" 
-                   long_name="Total EP Flux along V in nonoro" 
-                   unit="" />
-            <field id="du_nonoro_gwd" 
-                   long_name="Tendency on U due to nonoro GW" 
+            <field id="nonoro_u_epflux_tot"
+                   long_name="Total EP Flux along U in nonoro"
+                   unit="" />
+            <field id="nonoro_v_epflux_tot"
+                   long_name="Total EP Flux along V in nonoro"
+                   unit="" />
+            <field id="du_nonoro_gwd"
+                   long_name="Tendency on U due to nonoro GW"
                    unit="m.s-2" />
-            <field id="dv_nonoro_gwd" 
-                   long_name="Tendency on V due to nonoro GW" 
-                   unit="m.s-2" />        
-        
+            <field id="dv_nonoro_gwd"
+                   long_name="Tendency on V due to nonoro GW"
+                   unit="m.s-2" />
+
         </field_group>
 
@@ -1207,27 +1207,27 @@
                    long_name="Soil thermal inertia for slope 07"
                    unit="J/kg/K" />
-            <field id="Waterdensity_soil"
-                   long_name="Waterdensity_soil"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope01"
-                   long_name="Waterdensity_soil of slope 01"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope02"
-                   long_name="Waterdensity_soil of slope 02"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope03"
-                   long_name="Waterdensity_soil of slope 03"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope04"
-                   long_name="Waterdensity_soil of slope 04"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope05"
-                   long_name="Waterdensity_soil of slope 05"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope06"
-                   long_name="Waterdensity_soil of slope 06"
-                   unit="kg.m-3" />
-            <field id="Waterdensity_soil_slope07"
-                   long_name="Waterdensity_soil of slope 07"
+            <field id="waterdensity_soil"
+                   long_name="waterdensity_soil"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope01"
+                   long_name="waterdensity_soil of slope 01"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope02"
+                   long_name="waterdensity_soil of slope 02"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope03"
+                   long_name="waterdensity_soil of slope 03"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope04"
+                   long_name="waterdensity_soil of slope 04"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope05"
+                   long_name="waterdensity_soil of slope 05"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope06"
+                   long_name="waterdensity_soil of slope 06"
+                   unit="kg.m-3" />
+            <field id="waterdensity_soil_slope07"
+                   long_name="waterdensity_soil of slope 07"
                    unit="kg.m-3" />
             <field id="zdqsdif_ssi_frost"
Index: /trunk/LMDZ.MARS/deftank/file_def_physics_mars.xml
===================================================================
--- /trunk/LMDZ.MARS/deftank/file_def_physics_mars.xml	(revision 3121)
+++ /trunk/LMDZ.MARS/deftank/file_def_physics_mars.xml	(revision 3122)
@@ -9,9 +9,9 @@
         <file id="histins"
               name="Xhistins"
-              output_freq="12ts" 
+              output_freq="12ts"
               time_units="days"
               type="one_file"
               enabled=".false.">
-                    
+
             <!-- VARS 0D -->
             <field_group operation="instant"
@@ -54,9 +54,9 @@
         <file id="diurnalave_"
               name="Xdiurnalave_"
-              output_freq="1d" 
+              output_freq="1d"
               time_units="days"
               type="one_file"
               enabled=".false.">
-                    
+
             <!-- VARS 0D -->
             <field_group operation="average"
@@ -88,5 +88,5 @@
               time_units="days"
               enabled=".true.">
-                    
+
             <!-- VARS 0D -->
             <field_group operation="average"
@@ -100,5 +100,5 @@
                 <field field_ref="ps" />
                 <field field_ref="tsurf" />
-                <field field_ref="Waterdensity_surface" />
+                <field field_ref="waterdensity_surface" />
                 <field field_ref="h2o_layer1" />
                 <field field_ref="co2_layer1" />
@@ -118,5 +118,5 @@
                          freq_op="1ts">
                 <field field_ref="soiltemp" />
-                <field field_ref="Waterdensity_soil" />
+                <field field_ref="waterdensity_soil" />
             </field_group>
         </file>
@@ -129,16 +129,15 @@
               time_units="days"
               enabled=".false.">
-                    
-            <!-- VARS 0D -->
-            <field_group operation="average"
-                         freq_op="1ts">
-                <field field_ref="Ls" />
-            </field_group>
-
-            <field_group operation="average"
-                         freq_op="1ts">
-                <field field_ref="area" operation="once" />
-                <field field_ref="ps" />
-                <field field_ref="tsurf" />
+
+            <!-- VARS 0D -->
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="Ls" />
+            </field_group>
+
+            <field_group operation="average"
+                         freq_op="1ts">
+                <field field_ref="area" operation="once" />
+                <field field_ref="ps" />
                 <field field_ref="tsurf_slope01" />
                 <field field_ref="tsurf_slope02" />
@@ -148,12 +147,11 @@
                 <field field_ref="tsurf_slope06" />
                 <field field_ref="tsurf_slope07" />
-                <field field_ref="Waterdensity_surface" />
-                <field field_ref="Waterdensity_surface01" />
-                <field field_ref="Waterdensity_surface02" />
-                <field field_ref="Waterdensity_surface03" />
-                <field field_ref="Waterdensity_surface04" />
-                <field field_ref="Waterdensity_surface05" />
-                <field field_ref="Waterdensity_surface06" />
-                <field field_ref="Waterdensity_surface07" />
+                <field field_ref="waterdensity_surface01" />
+                <field field_ref="waterdensity_surface02" />
+                <field field_ref="waterdensity_surface03" />
+                <field field_ref="waterdensity_surface04" />
+                <field field_ref="waterdensity_surface05" />
+                <field field_ref="waterdensity_surface06" />
+                <field field_ref="waterdensity_surface07" />
                 <field field_ref="h2o_layer1" />
                 <field field_ref="co2_layer1" />
@@ -172,5 +170,4 @@
                 <field field_ref="co2ice_slope06" />
                 <field field_ref="co2ice_slope07" />
-                <field field_ref="h2o_ice_s" />
                 <field field_ref="h2o_ice_s_slope01" />
                 <field field_ref="h2o_ice_s_slope02" />
@@ -180,5 +177,4 @@
                 <field field_ref="h2o_ice_s_slope06" />
                 <field field_ref="h2o_ice_s_slope07" />
-                <field field_ref="watercap" />
                 <field field_ref="watercap_slope01" />
                 <field field_ref="watercap_slope02" />
@@ -193,5 +189,4 @@
             <field_group operation="average"
                          freq_op="1ts">
-                <field field_ref="soiltemp" />
                 <field field_ref="soiltemp_slope01" />
                 <field field_ref="soiltemp_slope02" />
@@ -201,15 +196,13 @@
                 <field field_ref="soiltemp_slope06" />
                 <field field_ref="soiltemp_slope07" />
-                <field field_ref="Waterdensity_soil" />
-                <field field_ref="Waterdensity_soil_slope01" />
-                <field field_ref="Waterdensity_soil_slope02" />
-                <field field_ref="Waterdensity_soil_slope03" />
-                <field field_ref="Waterdensity_soil_slope04" />
-                <field field_ref="Waterdensity_soil_slope05" />
-                <field field_ref="Waterdensity_soil_slope06" />
-                <field field_ref="Waterdensity_soil_slope07" />
+                <field field_ref="waterdensity_soil_slope01" />
+                <field field_ref="waterdensity_soil_slope02" />
+                <field field_ref="waterdensity_soil_slope03" />
+                <field field_ref="waterdensity_soil_slope04" />
+                <field field_ref="waterdensity_soil_slope05" />
+                <field field_ref="waterdensity_soil_slope06" />
+                <field field_ref="waterdensity_soil_slope07" />
             </field_group>
         </file>
 
     </file_definition>
-
Index: /trunk/LMDZ.MARS/libf/phymars/physiq_mod.F
===================================================================
--- /trunk/LMDZ.MARS/libf/phymars/physiq_mod.F	(revision 3121)
+++ /trunk/LMDZ.MARS/libf/phymars/physiq_mod.F	(revision 3122)
@@ -3890,16 +3890,16 @@
         ENDDO
 
-      CALL write_output("Waterdensity_soil",
+      CALL write_output("waterdensity_soil",
      &     "rhowater_soil",'kg.m-3',
      &     rhowater_soil(:,:,iflat))
-      CALL write_output("Waterdensity_surface",
+      CALL write_output("waterdensity_surface",
      &     "rhowater_surface",'kg.m-3',
      &     rhowater_surf(:,iflat))
       DO islope = 1,nslope
         write(str2(1:2),'(i2.2)') islope
-        CALL write_output("Waterdensity_soil_slope"//str2,
+        CALL write_output("waterdensity_soil_slope"//str2,
      &     "rhowater_soil_slope"//str2,'kg.m-3',
      &     rhowater_soil(:,:,islope))
-        CALL write_output("Waterdensity_surface"//str2,
+        CALL write_output("waterdensity_surface"//str2,
      &     "rhowater_surface"//str2,'kg.m-3',
      &     rhowater_surf(:,islope))
