Index: trunk/MESOSCALE/LMD_MM_MARS/makemeso
===================================================================
--- trunk/MESOSCALE/LMD_MM_MARS/makemeso	(revision 1724)
+++ trunk/MESOSCALE/LMD_MM_MARS/makemeso	(revision 1746)
@@ -74,6 +74,4 @@
 # makemeso -p mars_lmd_new   ## choose physics
 #             venus_lmd_new
-#             generic_lmd_new
-#             titan_lmd_new
 #
 # makemeso -f                ## fresh start [clean -a]
@@ -244,29 +242,7 @@
       cd ..
 
-     # remove files adapted to parallel GCM and useless for mesoscale
-     #cd mars_lmd
-     #cd libf/phymars
-     #\rm tabfi* soil_settings* phyetat0* phyredem* iostart* writediagfi* mkstat* writediagsoil* eofdump* wstats* inistats* mod_*
-     #\rm iniphysiq* init_phys_lmdz* comgeomphy* planetwide_mod*
-     #mv ../dyn3d/control_mod.F90 .
-     #cd ../..
-     #cd ..
-
-    else
-         if [[ "${config}" == "les" ]] 
-         then
-           #### NB: With physics: LES folder // Without physics : LESnophys_ folder
-           #### ---- because differences in 'modif' folder ----
-           #sed s+"PWD/SRC/"+"PWD/SRC/LES$phys/"+g SRC/SCRIPTS/copy_model > copy_model_tmp
-           sed s+"PWD/SRC/"+"PWD/SRC/LES/"+g SRC/SCRIPTS/copy_model > copy_model_tmp
-         else
-           cp SRC/SCRIPTS/copy_model copy_model_tmp
-         fi   
-     chmod 755 copy_model_tmp
-     ./copy_model_tmp
-     \rm copy_model_tmp
-     mv zeWRFV2 ${conf_wrf}/WRFV2
-     cd ${conf_wrf}/WRFV2
-     cd Registry ; ./Registry.bash ; cd .. 
+     else
+      cd ${conf_wrf}/WRFV2
+      cd Registry ; ./Registry.bash ; cd .. 
      fi
           #### sparadrap consequent a l'utilisation de copy_model pour les liens
@@ -414,5 +390,4 @@
                        then
                          sed s+"-lnetcdf"+"-lnetcdf -L../$phys/libo -llmd $NETCDF/lib/libnetcdf.a"+g   configure.wrf > yeah ; mv -f yeah configure.wrf
-                         #sed s+"O3"+"O3"+g configure.wrf > yeah ; mv -f yeah configure.wrf
                        else
                          sed s+"-lnetcdf"+"-lnetcdf $NETCDF/lib/libnetcdf.a"+g   configure.wrf > yeah ; mv -f yeah configure.wrf
@@ -481,5 +456,5 @@
                          mv -f yeah configure.wrf ;;
      mpifort_64)     # MPI+IFORT, 64 bits, no nesting / nesting
-                       echo 9 | ./configure > log_compile 2> log_error 
+                       echo 9 | configure > log_compile 2> log_error 
                        sed -f physics.sed configure.wrf > yeah ; mv -f yeah configure.wrf 
                        sed s+"-f90=ifort"+" "+g configure.wrf > yeah ; mv -f yeah configure.wrf 
@@ -492,5 +467,5 @@
                              then
                              echo 'DEBUG DEBUG DEBUG DEBUG'
-                             sed s+"#-g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
+                             sed s+"# -g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
                              mv -f yeah configure.wrf
                        fi
@@ -512,9 +487,5 @@
                          sed s+"mpicc"+"mpicc -DMPI2_SUPPORT"+g configure.wrf > yeah ; mv -f yeah configure.wrf
                          ## !!! NETCDF must be defined
-                         if [[ "${phys}" != *"void"* ]]
-                           sed s+"-L../$phys/libo -llmd"+"-L../$phys/libo -llmd $NETCDF/lib/libnetcdf.a $NETCDF/lib/libnetcdff.a"+g configure.wrf > yeah 
-                         else
-                           sed s+"-lesmf_time"+"-lesmf_time $NETCDF/lib/libnetcdf.a $NETCDFF/lib/libnetcdff.a"+g configure.wrf > yeah
-                         fi
+                         sed s+"-L../$phys/libo -llmd"+"-L../$phys/libo -llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah 
                          mv -f yeah configure.wrf 
                          #### POUR LE TRAITEMENT PARTICULIERS des NESTS sur iDATAPLEX [cf. module_lmd_driver]
@@ -614,6 +585,4 @@
     sed s+"LIB_BUNDLED     = "+"LIB_BUNDLED     =    /usr/lib64/liblapack.so  \ "+g configure.wrf > yeah ; mv -f yeah configure.wrf
     #sed s+"RWORDSIZE       =       "+"RWORDSIZE       =       8 # "+g configure.wrf > yeah ; mv -f yeah configure.wrf
-    #sed s+"PROMOTION       =       -i4"+'PROMOTION       = -real-size "expr 8 \* $(RWORDSIZE)" -i4'+g configure.wrf > yeah ; mv -f yeah configure.wrf
-    #sed s+"PROMOTION       =       -i4"+"PROMOTION       =       -real_size 64 -i4"+g configure.wrf > yeah ; mv -f yeah configure.wrf
     #sed s+"-DLWORDSIZE=4 "+"-DLWORDSIZE=8 "+g configure.wrf > yeah ; mv -f yeah configure.wrf
     #sed s+"-DIWORDSIZE=4 "+"-DIWORDSIZE=8 "+g configure.wrf > yeah ; mv -f yeah configure.wrf
@@ -704,17 +673,11 @@
   then 
     cd libf/phyvenus
-  elif [[ "${phys}" == *"generic"* ]]
-  then
-    cd libf/phystd
-  elif [[ "${phys}" == *"titan"* ]]
-  then
-    cd libf/phytitan
   fi
   \rm dimphys.h 2> /dev/null
-  #if [[ "${phys}" == "newphys_" ]]
-  #then
-  #  ln -sf ../../meso_dimphys.h_ref . ## ne sert plus !!
-  #else
-  if [[ "${phys}" != "newphys_" ]] 
+#  if [[ "${phys}" == "newphys_" ]]
+#  then
+#    ln -sf ../../meso_dimphys.h_ref . ## ne sert plus !!
+#  else
+  if [[ "${phys}" == "mars_lmd" ]]
   then
     physize=$(expr ${physx} \* ${physy})
@@ -722,15 +685,15 @@
     head -15 dimphys.h
   fi
-     ### TEST new new phys
+     #### TEST new new phys
      #if [[ "${phys}" == "newphys_" ]]
      #then
      #  touch gr_fi_dyn.F.lien
      #    ln -sf ../dyn3d/gr_fi_dyn.F .  ## dommage, a corriger 
-     ###############################
-     ###############################
-     ###############################
+     ################################
+     ################################
+     ################################
      #fi 
-     ###
-     ###
+     ####
+     ####
   cd ../..
 
@@ -748,5 +711,5 @@
   echo compilation info in: 
   echo $PWD/libo/log_compile_phys
-  
+
   if [ ${debug} -ne 0 ]  
   then
@@ -754,29 +717,17 @@
     then
       echo 'DEBUG DEBUG DEBUG DEBUG'
-      nohup makegcm_${compilo} debug -t ${tra} -p mars -d ${physz} testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
+      nohup makegcm_${compilo} -debug -full -t ${tra} -p mars -d ${physz} testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
     elif [[ "${phys}" == *"venus"* ]]
     then 
       echo 'DEBUG DEBUG DEBUG DEBUG'
-      nohup ./makelmdz -debug -full -p venus -d 181 rcm1d -arch X64_MESU -cpp MESOSCALE | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
-    elif [[ "${phys}" == *"generic"* ]]
-    then
-      echo 'DEBUG DEBUG DEBUG DEBUG'
-      nohup ./makegcm_ifort -debug -t ${tra} -p std -b 36x32 -d 25 rcm1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
-      #nohup ./makegcm_ifort -t ${tra} -p std -b 36x32 -d 25 rcm1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
+      nohup makelmdz -debug -full -p venus -d 181 rcm1d -arch linux-ifort -cpp MESOSCALE | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
     fi
   else
-    if [[ "${phys}" == *"mars"* ]]
+  if [[ "${phys}" == *"mars"* ]]
     then
       nohup makegcm_${compilo} -t ${tra} -p mars -d ${physz} testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
     elif [[ "${phys}" == *"venus"* ]]
     then
-      nohup ./makelmdz -full -p venus -d 51 rcm1d -arch linux-ifort_meso -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys # on /u/ and /planeto/
-      nohup ./makelmdz -p venus -d 51 rcm1d -arch linux-ifort_meso -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
-      #nohup ./makelmdz -full -p venus -d 51 rcm1d -arch CICLADifort -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys # on CICLAD
-      #nohup ./makelmdz -p venus -d 51 rcm1d -arch CICLADifort -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
-      #nohup ./makelmdz -full -p venus -d 51 rcm1d -arch X64_MESU -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys #on MESU
-      #nohup ./makelmdz -p venus -d 51 rcm1d -arch X64_MESU -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
-      #nohup makelmdz -full -p venus -d 51 rcm1d -arch X64_OCCIGEN -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys #on OCCIGEN
-      #nohup makelmdz -p venus -d 51 rcm1d -arch X64_OCCIGEN -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys 
+      nohup makelmdz -full -p venus -d 51 rcm1d -arch linux-ifort -cpp MESOSCALE  | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
     fi
   fi
@@ -791,9 +742,7 @@
   cd libo
   mkdir temp
-  if [[ ("${phys}" == *"venus"*) ]]
-  then
-    cp -f linux*/*.a temp/ # on /u/ and /planeto/
-    #cp -f /home/mlefevre/modipsl/lib/libioipsl.a temp/ #on CICLAD
-    #cp -f X64*/*.a temp #on MESU and OCCIGEN
+  if [[ "${phys}" == *"venus"* ]]
+  then
+    cp -f linux*/*.a temp/
     cp -f ../ioipsl/libioipsl.a temp/
   else 
@@ -806,6 +755,5 @@
    ar x libphymars.a
    ar x libaeronomars.a
-  elif [[ "${phys}" == *"venus"* ]]
-  then 
+  else 
    ar x libphyvenus.a
    ar x libmisc.a
@@ -821,5 +769,4 @@
   # finish merge
   cd ..
-  echo ${phys}
   if [[ "${phys}" == *"new"* ]]
   then
@@ -828,10 +775,8 @@
       # include modules for interfacing
       mv  *.mod ../inc/
-    elif  [[ ("${phys}" == *"venus"*)]] 
-    then
-      mv  ./libo/linux*/*.mod ../inc/ # on /u/ and /planeto/
-      #mv  ./libo/CICLAD*/*.mod ../inc/ # on CICLAD
-      #mv  ./libo/X64*/*.mod ../inc/ # on MESU and OCCIGEN
+    else # [[ "${phys}" == *"venus"* ]] 
+      mv  ./libo/linux*/*.mod ../inc/
       cp -f ./ioipsl/*.mod ../inc/
+      
     fi
   fi