Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars0
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars0	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars0	(revision 1247)
@@ -148,4 +148,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars11_radact
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars11_radact	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars11_radact	(revision 1247)
@@ -142,4 +142,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars12_radact_scav
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars12_radact_scav	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars12_radact_scav	(revision 1247)
@@ -140,4 +140,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars1_radact
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars1_radact	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars1_radact	(revision 1247)
@@ -145,4 +145,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars2
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars2	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars2	(revision 1247)
@@ -147,4 +147,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars3
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars3	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/DEF/newphys_THARSIS_WATER/callphys.def.mars3	(revision 1247)
@@ -144,4 +144,8 @@
 photochem  = .false.
 
+# SCATTERERS: set number of scatterers. must be compliant with preceding options.
+naerkind = 2
+
+
 ## Thermospheric options (relevant if tracer=T) :
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Index: trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso	(revision 1247)
@@ -191,26 +191,4 @@
 echo '** Domain(s)             >>> '${nest} 
 echo '** Tracer(s)             >>> '${tracers}
-
-   ############ SCATTERERS SCATTERERS ######
-   if [[ ${newphys} -eq 1 ]]
-   then
-     #### CHANGE THIS IF YOU ADD NEW SCENARIOS
-     case ${mars_scenario} in
-       0) scat=1 ;;
-       1) echo "!! How many scatterers are you using : 1,2,..." ; read scat ;;
-       2) scat=1 ;;
-       3) scat=1 ;;
-      11) echo "!! How many scatterers are you using : 1,2,..." ; read scat ;;
-      12) echo "!! How many scatterers are you using : 1,2,..." ; read scat ;;
-      20) scat=1 ;;
-       *) scat=1 ;;
-     esac
-     echo '** Scatterers            >>> '${scat}
-   else 
-     #### USELESS here BUT COMPATIBILITY
-     scat=1
-   fi
-   #########################################
-
 echo '** Grid points           >>> '${nx}" x "${ny}" x "${nz}
 echo '** Horizontal resolution >>> '${dx}
@@ -379,6 +357,6 @@
  cd ${simu_folder}
      ## corresponding executables
-    wrfexe=${work_folder}/wrf_x${nx}_y${ny}_z${nz}_d${nest}_t${tracers}_p${numproc}_s${scat}.exe
-    realexe=${work_folder}/real_x${nx}_y${ny}_z${nz}_d${nest}_t${tracers}_p${numproc}_s${scat}.exe
+    wrfexe=${work_folder}/wrf_x${nx}_y${ny}_z${nz}_d${nest}_t${tracers}_p${numproc}.exe
+    realexe=${work_folder}/real_x${nx}_y${ny}_z${nz}_d${nest}_t${tracers}_p${numproc}.exe
  if [[ ${fresh} -eq 0 && -f ${wrfexe} ]]
  then
@@ -404,17 +382,18 @@
    touch ${simu_folder}/makemeso_input
    echo ${compilo} >> ${simu_folder}/makemeso_input
-   if [[ "${compilo}" = "3" || "${compilo}" = "5" ]]
+   if [[ ${newphys} -eq 0 ]]
+   then
+     if [[ "${compilo}" = "3" || "${compilo}" = "5" ]]
      then
          echo ${numproc} >> ${simu_folder}/makemeso_input
-   fi
-   echo ${nx} >> ${simu_folder}/makemeso_input
-   echo ${ny} >> ${simu_folder}/makemeso_input
+     fi
+     echo ${nx} >> ${simu_folder}/makemeso_input
+     echo ${ny} >> ${simu_folder}/makemeso_input
+   fi
    echo ${nz} >> ${simu_folder}/makemeso_input
    echo ${nest} >> ${simu_folder}/makemeso_input
-   echo ${tracers} >> ${simu_folder}/makemeso_input
-   if [[ ${newphys} -eq 1 ]]
-   then
-     echo ${scat} >> ${simu_folder}/makemeso_input
-     #echo 'n' >> ${simu_folder}/makemeso_input
+   if [[ ${newphys} -eq 0 ]]
+   then
+     echo ${tracers} >> ${simu_folder}/makemeso_input
    fi
    #
Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/SCRIPTS/NETCDF/gfortran_netcdf4
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SRC/SCRIPTS/NETCDF/gfortran_netcdf4	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SRC/SCRIPTS/NETCDF/gfortran_netcdf4	(revision 1247)
@@ -1,27 +1,10 @@
 #! /bin/bash
 
+ze_netcdf=netcdf-4.0.1
+#ze_netcdf=netcdf-3.6.1
 
-##wget http://www.lmd.jussieu.fr/~hourdin/PATCH_LMDZ4OR_G95/netcdf-3.6.1.tar.gz
-##gunzip netcdf-3.6.1.tar.gz
-#tar xvf netcdf-3.6.1.tar
-#cd netcdf-3.6.1
-
-cp /donnees/emlmd/Downloads/Software/netcdf-4.0.1.tar.gz .
-gunzip netcdf-4.0.1.tar.gz
-tar xvf netcdf-4.0.1.tar
-cd netcdf-4.0.1
-
-#export CC=gcc 
-#export CXX=g++ 
-#export CPP='gcc -E' 
-#export FC=gfortran 
-#export F77=gfortran 
-#export F90=gfortran 
-#export CFLAGS='-O2 -DpgiFortran' 
-#export CXXFLAGS='-O2 -DpgiFortran' 
-#export CPPFLAGS='-DpgiFortran' 
-#export FFLAGS='-O2 -fno-second-underscore' 
-#export FCFLAGS='-O2 -fno-second-underscore' 
-#export F90FLAGS='-O2 -fno-second-underscore'
+wget ftp://ftp.unidata.ucar.edu/pub/netcdf/$ze_netcdf.tar.gz
+tar xzvf $ze_netcdf.tar.gz
+\rm $ze_netcdf.tar.gz
 
 export FC=gfortran
@@ -35,14 +18,14 @@
 export CXXFLAGS="-O2"
 
-mkdir /donnees/aslmd/MODELES/MESOSCALE_DEV/NETCDF/netcdf64-4.0.1_gfortran
-./configure --prefix=/donnees/aslmd/MODELES/MESOSCALE_DEV/NETCDF/netcdf64-4.0.1_gfortran #> configure.log 2>&1
-make #> make.log 2>&1
-make test #> make_test.log 2>&1
-make install #> make_install.log 2>&1
+mv $ze_netcdf gfortran_$ze_netcdf
+cd gfortran_$ze_netcdf
+PREFIX=$PWD
+if [[ "$ze_netcdf" == "netcdf-3.6.1" ]]
+then
+      cd src
+fi
 
-#cd src
-## Compilation
-#./configure
-#make check
-#make install
-
+./configure --prefix=${PREFIX} #--disable-cxx
+make > make.log 2>&1
+make test > make.log 2>&1
+make install > make.log 2>&1
Index: trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/module_lmd_driver.F.new	(revision 1247)
@@ -584,5 +584,5 @@
 
   !! Read callphys.def !!
-  call conf_phys(nq)
+  call conf_phys(ngrid,nlayer,nq)
 
 #endif
Index: trunk/MESOSCALE/LMD_MM_MARS/makemeso
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/makemeso	(revision 1243)
+++ trunk/MESOSCALE/LMD_MM_MARS/makemeso	(revision 1247)
@@ -207,11 +207,4 @@
                 tra=1	 
               fi
-            fi
-            # scatterers: a specific stuff for newphys
-            if [[ "${phys}" == "newphys_" ]]
-            then
-              echo "How many types of scatterer are you using ? 1 [dust] or 2 [dust + water ice]" ; read scat
-            else
-              scat=1 ## dummy stuff
             fi
          fi
@@ -367,5 +360,4 @@
   if [[ "${phys}" == "newphys_" ]]
   then
-   echo you have ${scat} scatterers
    echo number of processors can be changed without recompiling
    echo x points can be changed without recompiling
@@ -398,6 +390,4 @@
    echo ${tra} >> last
   fi
-  echo ${scat} >> last
-  #echo ${answer} >> last
 
 #------------
@@ -713,19 +703,4 @@
          ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger 
      ###############################
-\rm scatterers.h
-cat << EOF > scatterers.h
-!-----------------------------------------------------------------------
-!   INCLUDE 'scatterers.h'
-!
-! Number of kind of tracer radiative properties 
-! ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-! (ex: naerkind=1 if you use one dust mode without ice ...)
-! (ex: naerkind=2 if you use one dust mode and active ice ...)
-!-----------------------------------------------------------------------
-
-      integer, parameter :: naerkind=${scat}
-
-!-----------------------------------------------------------------------
-EOF
      ###############################
      ###############################
@@ -789,5 +764,5 @@
   # save a copy 
   #--------------
-  cp -f libo/liblmd.a libo/liblmd.a_${lon}_${lat}_${level}_${dom}_${tra}_${scat} 
+  cp -f libo/liblmd.a libo/liblmd.a_${lon}_${lat}_${level}_${dom}_${tra}
   echo '****************************************'
 
@@ -849,6 +824,6 @@
                         echo 'Looks good ! wrf.exe is here...' 
                       fi
-                    cp -f real.exe ../../real_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
-                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
+                    cp -f real.exe ../../real_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
+                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
                     cd ..  ;;
     'ideal')        #mkdir 'test/em_quarter_ss' 2> /dev/null
@@ -865,6 +840,6 @@
                         echo 'Looks good ! wrf.exe is here...' 
                       fi
-                    cp -f ideal.exe ../../ideal_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
-                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
+                    cp -f ideal.exe ../../ideal_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
+                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
                     cd ..  ;;
     'les')          echo '>>> YOUR CONFIG IS : '${config}
@@ -881,6 +856,6 @@
                         echo 'Looks good ! wrf.exe is here...' 
                       fi
-                    cp -f ideal.exe ../../ideal_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
-                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.exe
+                    cp -f ideal.exe ../../ideal_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
+                    cp -f wrf.exe ../../wrf_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.exe
                     cd ..  ;;
     *)              echo not supported... please use ; echo ideal les ; exit ;;
@@ -894,7 +869,7 @@
   echo 'done.'
   echo '****************************************'
-  cp last ../makemeso_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}
+  cp last ../makemeso_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}
   mv last ../../
-  svn info ../../ > ../makemeso_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}_s${scat}.svn.info
+  svn info ../../ > ../makemeso_x${lon}_y${lat}_z${level}_d${dom}_t${tra}_p${numproc}.svn.info
 
   # add here specific messages