Changeset 1247 for trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso

Timestamp:

May 11, 2014, 3:56:22 PM (11 years ago)

Author:

aslmd

Message:

MESOSCALE. Adapted the mesoscale model to previous commit to LMD GCM physics where number of scatterers is no longer set at compiling time.

File:

• trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso (modified) (3 diffs)

trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso

@@ -191 +191 @@
 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 +357 @@
  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 +382 @@
    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
    #