Changeset 60

Timestamp:

Feb 14, 2011, 2:23:06 AM (14 years ago)

Author:

aslmd

Message:

LMD_MM_MARS et LMD_LES_MARS: ajouts de scripts et modifications runmeso/makeles/makemeso pour faire tourner le modele sur iDataPlex. premiers tests en parallele fonctionnent tres bien. le run 16procs est bien 4fois rapide que le run 4procs sur la ferme planeto. resultats totalement similaires 4procs TESTCASE entre auric et gnome (a part amortissement vitesse verticale aux premiers pas de temps). le LES fonctionne bien lui aussi, cependant il y a un bug a corriger relatif a un flux de chaleur sensible nul aux points d'interfaces entre 4 tuiles. ------ petite remarque sur LMDZ5: un job 24proc est 10fois plus rapide qu'un job 8proc absolument equivalent sur ciclad.

Location:

trunk/mesoscale

Files:

• LMD_LES_MARS/modif_mars/gnome_ideal.txt (added)
• LMD_LES_MARS/modif_mars/gnome_launch.les (added)
• LMD_LES_MARS/modif_mars/makeles (modified) (4 diffs)
• LMD_MM_MARS/SIMU/gnome_launch.meso (added)
• LMD_MM_MARS/SIMU/runmeso (modified) (2 diffs)
• LMD_MM_MARS/SRC/PREP_MARS/compile_ifort (added)
• LMD_MM_MARS/SRC/WPS/arch/configure.defaults (modified) (1 diff)
• LMD_MM_MARS/makemeso (modified) (2 diffs)

trunk/mesoscale/LMD_LES_MARS/modif_mars/makeles

@@ -72 +72 @@
 cd $here
 
-#------------------------------
-#------------------------------
-#
-# MPI (dm) 64 bits 
-#
-#TODO: le rendre adapte aux reponses du user a makemeso
-touch conf
-echo 3 >> conf 
-#echo 4 >> conf  #openMP n'arrange pas beaucoup de le tps de calcul
-echo 1 >> conf
-#------------------------------
-#------------------------------
+##------------------------------
+##------------------------------
+##
+## MPI (dm) 64 bits 
+##
+##TODO: le rendre adapte aux reponses du user a makemeso
+#touch conf
+#echo 3 >> conf 
+##echo 4 >> conf  #openMP n'arrange pas beaucoup de le tps de calcul
+#echo 1 >> conf
+##------------------------------
+##------------------------------
 
 
@@ -97 +97 @@
 #echo 0 >> conf
 
+## MPI (dm) 64 bits IFORT
+touch conf
+echo 7 >> conf
+echo 1 >> conf
 
 
@@ -109 +113 @@
 #sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+'mpif90 -f90=$(SFC)'+'/usr/lib64/openmpi/1.2.8-pgf/bin/mpif90'+g | sed s+'mpicc -cc=$(SCC)'+'/usr/lib64/openmpi/1.2.8-gcc/bin/mpicc -DMPI2_SUPPORT'+g > yeah
 ## WHERE_MPI must be defined
-sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+"mpif90"+"$WHERE_MPI/mpif90"+g | sed s+"mpicc"+"$WHERE_MPI/mpicc"+g > yeah
+sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+"mpif90"+"$WHERE_MPI/mpif90"+g | sed s+"mpicc"+"$WHERE_MPI/mpicc -DMPI2_SUPPORT"+g > yeah
 #sed s+"# -g"+"-fno-second-underscore # -g"+g configure.wrf | sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g > yeah
 #sed s+"-lnetcdf"+"-lnetcdf -L$whereliblmd -llmd"+g configure.wrf | sed s+"#-g"+"-g"+g > yeah
@@ -132 +136 @@
 #mv yeah configure.wrf
 
+#### OBLIGATOIRE POUR IFORT, OK AVEC LES AUTRES ???
+sed s+"-llmd"+"-llmd $NETCDF/lib/libnetcdf.a"+g configure.wrf > yeah
+mv yeah configure.wrf
+
+
 \rm conf
 

trunk/mesoscale/LMD_MM_MARS/SIMU/runmeso

@@ -220 +220 @@
  echo "**      <2> g95"
  echo "**      <3> mpi+pgf90"
+ echo "**      <4> ifort"
+ echo "**      <5> mpi+ifort"
  echo "**      .... more in makemeso ...."
  echo '**********************************************' 
- echo "Your choice ? (1-3)" ; read compilo
-   if [[ "${compilo}" == "" || ${compilo} -lt 1 || ${compilo} -gt 3 ]]
+ echo "Your choice ? (1-5)" ; read compilo
+   if [[ "${compilo}" == "" || ${compilo} -lt 1 || ${compilo} -gt 5 ]]
    then
        echo "** well, let's try g95"
        compilo=2
    fi
-   if [[ ${compilo} -eq 3 ]]
+   if [[ ${compilo} -eq 3 || ${compilo} -eq 5 ]]
    then
        echo How many processors ? 1, 2, 4, 6, 8, 16 ; read numproc
@@ -336 +338 @@
    touch ${simu_folder}/makemeso_input
    echo ${compilo} >> ${simu_folder}/makemeso_input
-   if [[ "${compilo}" = "3" ]]
+   if [[ "${compilo}" = "3" || "${compilo}" = "5" ]]
      then
          echo ${numproc} >> ${simu_folder}/makemeso_input

trunk/mesoscale/LMD_MM_MARS/SRC/WPS/arch/configure.defaults

@@ -233 +233 @@
 
 ###########################################################
-#ARCH   PC Linux i486 i586 i686, Intel compiler serial, NO GRIB2
+#ARCH   PC Linux i486 i586 i686 x86_64, Intel compiler  serial, NO GRIB2
 #
 COMPRESSION_LIBS        =

trunk/mesoscale/LMD_MM_MARS/makemeso

@@ -128 +128 @@
          exit
        fi 
-       echo How many processors ? 1, 2, 4, 6, 8, 12, 16 ; read numproc ;;
+       echo How many processors ? 1, 2, 4, 6, 8, 12, 16, 20, 24 test 32 64 ; read numproc ;;
     4) compilo='ifort' ; numproc=1 ;;
-    5) compilo='mpifort' ; echo How many processors ? 1, 2, 4, 6, 8, 12, 16 ; read numproc ;;
-    7) compilo='mpixlf' ; echo How many processors ? 1, 2, 4, 6, 8, 12, 16 ; read numproc ;;
+    5) compilo='mpifort' ; echo How many processors ? 1, 2, 4, 6, 8, 12, 16, 20, 24 test 32 64 ; read numproc ;;
+    7) compilo='mpixlf' ; echo How many processors ? 1, 2, 4, 6, 8, 12, 16, 20, 24 test 32 64 ; read numproc ;;
 ### for tests 
 99) compilo='gnu' ; numproc=1 ;;
@@ -410 +410 @@
         physy=$(expr ${lat} - 1) ; physy=$(expr ${physy} \/ 4)
         physz=$(expr ${level} - 1) ;;
+    20) physx=$(expr ${lon} - 1) ; physx=$(expr ${physx} \/ 4)
+        physy=$(expr ${lat} - 1) ; physy=$(expr ${physy} \/ 5)
+        physz=$(expr ${level} - 1) ;;
+    24) physx=$(expr ${lon} - 1) ; physx=$(expr ${physx} \/ 4)
+        physy=$(expr ${lat} - 1) ; physy=$(expr ${physy} \/ 6)
+        physz=$(expr ${level} - 1) ;;
+### TESTS
+    32) physx=$(expr ${lon} - 1) ; physx=$(expr ${physx} \/ 4)
+        physy=$(expr ${lat} - 1) ; physy=$(expr ${physy} \/ 8)
+        physz=$(expr ${level} - 1) ;;
+    64) physx=$(expr ${lon} - 1) ; physx=$(expr ${physx} \/ 8)
+        physy=$(expr ${lat} - 1) ; physy=$(expr ${physy} \/ 8)
+        physz=$(expr ${level} - 1) ;;
     *) echo not supported ; exit
   esac