Changeset 1247 for trunk/MESOSCALE/LMD_MM_MARS/makemeso

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/makemeso (modified) (9 diffs)

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -207 +207 @@
                 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 +360 @@
   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 +390 @@
    echo ${tra} >> last
   fi
-  echo ${scat} >> last
-  #echo ${answer} >> last
 
 #------------
@@ -713 +703 @@
          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 +764 @@
   # 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 +824 @@
                         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 +840 @@
                         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 +856 @@
                         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 +869 @@
   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