From 3625bfd6cfbde74db2cccfe9955a9cc9193a9d22 Mon Sep 17 00:00:00 2001
From: Juan Escobar <juan.escobar@aero.obs-mip.fr>
Date: Tue, 21 Apr 2015 08:25:58 +0000
Subject: [PATCH] Juan 21/04/2015: upgrade A-INSTALL to 5-2-0

---
 A-INSTALL           | 66 ++++++++++++++++++++++-----------------------
 conf/profile_mesonh | 15 +++++++----
 2 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/A-INSTALL b/A-INSTALL
index 456299cb4..cd57d4bbb 100644
--- a/A-INSTALL
+++ b/A-INSTALL
@@ -1,8 +1,8 @@
 #
 # Version of PACKAGE MESONH "Open distribution"
-#              PACK-MNH-V5-1-3
-#              DATE : 20/11/2014
-#              VERSION : MESONH MASDEV5_1 + BUG-3 
+#              PACK-MNH-V5-2-0
+#              DATE : 21/04/2015
+#              VERSION : MESONH MASDEV5_2 + BUG-0 
 #
 #  MAP
 #
@@ -81,7 +81,7 @@
 #
 # in the field  "Show files using tag:" 
 #
-#    ---> select "PACK-MNH-V5-1-3"
+#    ---> select "PACK-MNH-V5-2-0"
 #
 # and then download the file "PACK-MNH-VX-Y-Z.tar.gz" by the link 
 #
@@ -99,7 +99,7 @@ tar xvfz PACK-MNH-VX-Y-Z.tar.gz
 # to the right one
 #
  
-mv MNH-VX-Y-Z MNH-V5-1-3
+mv MNH-VX-Y-Z MNH-V5-2-0
       
 #
 #  Process now to the chapter to configure the MesoNH 
@@ -125,7 +125,7 @@ mv MNH-VX-Y-Z MNH-V5-1-3
 #
 # in the field  "Show files using tag:" 
 #
-#    ---> select "PACK-MNH-V5-1-3"
+#    ---> select "PACK-MNH-V5-2-0"
 #
 #   download the file "anoncvs.key"
 #
@@ -200,19 +200,19 @@ export CVSROOT=:ext:mesonh_anoncvs_www:/home/cvsroot
 #   -------------------------------------
 #
 #   Now, from your "$HOME" directory for example 
-#   extract the version "PACK-MNH-V5-1-3"
+#   extract the version "PACK-MNH-V5-2-0"
 #   of the directory "MNH-VX-Y-Z" from the
 #   cvs repository : 
 
 cd ~
-cvs co -r PACK-MNH-V5-1-3 -d MNH-V5-1-3 MNH-VX-Y-Z
+cvs co -r PACK-MNH-V5-2-0 -d MNH-V5-2-0 MNH-VX-Y-Z
 
 #
 # WARNING : don't use a sub-directory with dot "." in the name
 #            ---> you could have some trouble when compiling mesonh
 #
-#  this will create in your "$HOME" a directory "MNH-V5-1-3" 
-#  which contains of the last revision named "PACK-MNH-V5-1-3" 
+#  this will create in your "$HOME" a directory "MNH-V5-2-0" 
+#  which contains of the last revision named "PACK-MNH-V5-2-0" 
 #  of the MESONH PACKAGE 
 #
 #  The advantage of this way of downloading 
@@ -222,21 +222,21 @@ cvs co -r PACK-MNH-V5-1-3 -d MNH-V5-1-3 MNH-VX-Y-Z
 #  to download entirely the full package
 #
 #  Suppose that a new version for example
-#  "PACK-MNH-V5-1-4" is announced ...
+#  "PACK-MNH-V5-2-1" is announced ...
 #
 #  To see the differences with your working copy
 #  do
 #
 
-cd ~/MNH-V5-1-3
-cvs diff -r PACK-MNH-V5-1-4
+cd ~/MNH-V5-2-0
+cvs diff -r PACK-MNH-V5-2-1
 
 #
 #  And to upgrade your working copy
 #
 
-cd ~/MNH-V5-1-3
-cvs update -r PACK-MNH-V5-1-4 -d -P
+cd ~/MNH-V5-2-0
+cvs update -r PACK-MNH-V5-2-1 -d -P
 
 #
 # At any time you could also check for "uptodate" 
@@ -251,7 +251,7 @@ cvs diff -r MNH410-BUG-branch
 # ( not yet official ) version by
 #
 
-cd ~/MNH-V5-1-3
+cd ~/MNH-V5-2-0
 cvs update -r MNH410-BUG-branch -d -P
 
 #
@@ -271,7 +271,7 @@ cvs update -r MNH410-BUG-branch -d -P
 #    use the "./configure" script like this 
 #
 
-cd ~/MNH-V5-1-3/src
+cd ~/MNH-V5-2-0/src
 ./configure
 . ../conf/profile_mesonh
 
@@ -316,7 +316,7 @@ export OPTLEVEL=O2         # Compile in O2 , 4 time faster then DEBUG, but least
 
 #    and then source/load the new generate file
 
-. ../conf/profile_mesonh.LXifort.MNH-V5-1-3.MPIAUTO.O2
+. ../conf/profile_mesonh.LXifort.MNH-V5-2-0.MPIAUTO.O2
 
 #
 #  REM: 
@@ -341,7 +341,7 @@ export OPTLEVEL=O2         # Compile in O2 , 4 time faster then DEBUG, but least
 # go to the directory  "src"
 #
 
-cd  ~/MNH-V5-1-3/src
+cd  ~/MNH-V5-2-0/src
 
 #
 # if you have not already configured your MESONH environment
@@ -569,8 +569,8 @@ make examples
 # 
 
 cd $WORKDIR
-cvs co -r PACK-MNH-V5-1-3 -d MNH-V5-1-3 MNH-VX-Y-Z
-cd MNH-V5-1-3/src
+cvs co -r PACK-MNH-V5-2-0 -d MNH-V5-2-0 MNH-VX-Y-Z
+cd MNH-V5-2-0/src
 
 ./configure
  
@@ -631,7 +631,7 @@ export ARCH=LXifort
 
 ...
 
-création du fichier -->  ../conf/profile_mesonh-LXifortI4-MNH-V5-1-3-MPICRAY-O2
+création du fichier -->  ../conf/profile_mesonh-LXifortI4-MNH-V5-2-0-MPICRAY-O2
 
 # And for the compilation & example job , switch the ARCH variable to LXiort :
 
@@ -639,7 +639,7 @@ vi  job_make_mesonh_CRAY_cca(job_make_examples_CRAY_cca)
 
 ARCH=LXifort
 #ARCH=LXcray # this is the default one
-. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-1-3-MPICRAY-O2
+. ../conf/profile_mesonh-${ARCH}I4-MNH-V5-2-0-MPICRAY-O2
 
 
 
@@ -730,7 +730,7 @@ scandollar
 
 ## OUTPUT ::
 
->#  read default config file :: --->  CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-1-3/conf/post/confdollar_aeropc_default
+>#  read default config file :: --->  CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-2-0/conf/post/confdollar_aeropc_default
 >#
 >#  read    user config file :: --->  CONFIG=confdollar
 >#
@@ -752,7 +752,7 @@ scandollar 0*
 
 ## OUTPUT ::
 >#
->#  read default config file :: --->  CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-1-3/conf/post/confdollar_aeropc_default
+>#  read default config file :: --->  CONF_DOLLAR=/home/escj/DEV64/PACK-MNH-V5-2-0/conf/post/confdollar_aeropc_default
 >#
 >#  read    user config file :: --->  CONFIG=confdollar
 >#
@@ -826,22 +826,22 @@ cp -R  007_16janvier_scandollar /.../your_directory
 #
 # use this "profile_mesonh" :
 
-.  /home/rech/mnh/rmnh007/DEV/MNH-V5-1-3/conf/profile_mesonh-SX8-MNH-V5-1-3-MPIAUTO-O4
+.  /home/rech/mnh/rmnh007/DEV/MNH-V5-2-0/conf/profile_mesonh-SX8-MNH-V5-2-0-MPIAUTO-O4
 
 # And the examples are here ( link to my $WORKDIR in actually )  
 
-/home/rech/mnh/rmnh007/DEV/MNH-V5-1-3/MY_RUN/KTEST/007_16janvier_scandollar
+/home/rech/mnh/rmnh007/DEV/MNH-V5-2-0/MY_RUN/KTEST/007_16janvier_scandollar
 
 #
 #  On vargas
 #  ---------
 #  use this "profile_mesonh" :
 
-. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-1-3/conf/profile_mesonh-AIX64-MNH-V5-1-3-MPIAUTO-O2
+. /workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-2-0/conf/profile_mesonh-AIX64-MNH-V5-2-0-MPIAUTO-O2
 
 # and examples here :
 
-/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-1-3/MY_RUN/KTEST/007_16janvier_scandollar
+/workgpfs/rech/mnh/rmnh007/DEV/MNH-V5-2-0/MY_RUN/KTEST/007_16janvier_scandollar
 
 # 
 #  - At CINES on JADE :
@@ -849,11 +849,11 @@ cp -R  007_16janvier_scandollar /.../your_directory
 #
 # use 
 
-. /work/escobar/DEV/MNH-V5-1-3/conf/profile_mesonh-LXifort-MNH-V5-1-3-MPIICE-O2
+. /work/escobar/DEV/MNH-V5-2-0/conf/profile_mesonh-LXifort-MNH-V5-2-0-MPIICE-O2
 
 # and the exemples
 
-/work/escobar/DEV/MNH-V5-1-3/MY_RUN/KTEST/007_16janvier_scandollar
+/work/escobar/DEV/MNH-V5-2-0/MY_RUN/KTEST/007_16janvier_scandollar
 
 #
 #  - At ECMWF on cxa :
@@ -861,11 +861,11 @@ cp -R  007_16janvier_scandollar /.../your_directory
 #
 # use
 
-. /c1a/ms_perm/au5/MNH-V5-1-3/conf/profile_mesonh-AIX64-MNH-V5-1-3-MPIAUTO-O2
+. /c1a/ms_perm/au5/MNH-V5-2-0/conf/profile_mesonh-AIX64-MNH-V5-2-0-MPIAUTO-O2
 
 # and the examples
 
-/c1a/ms_perm/au5/MNH-V5-1-3/MY_RUN/KTEST/007_16janvier_scandollar
+/c1a/ms_perm/au5/MNH-V5-2-0/MY_RUN/KTEST/007_16janvier_scandollar
 
 
 #
diff --git a/conf/profile_mesonh b/conf/profile_mesonh
index fb1e27621..7c383bad2 100755
--- a/conf/profile_mesonh
+++ b/conf/profile_mesonh
@@ -31,7 +31,7 @@ fi
 # SRC_MESONH : default path to mesonh sources 
 #              MUST BE SET TO YOUR OWN MESONH PATH
 #
-export SRC_MESONH="/home/escj/DEV64/MNH-V5-2-0"   
+export SRC_MESONH="/home/rchi421/DEV/MNH-V5-2-0"   
 #
 #  Version MESONH PACKAGE :: PACK-MNH-V5-2-0 : 15/04/2015
 #
@@ -41,19 +41,19 @@ export VERSION_XYZ=MNH-V5-2-0
 #
 #export ARCH=LXgfortran,LXifort,LXpgi,AIX64,SX8,BGQ
 #
-export ARCH=LXgfortran
+export ARCH=LXifort
 #
 #  Version of MPI
 #
 #export VER_MPI=MPIVIDE,MPIAUTO,MPIICE,MPIINTEL
 #
-export VER_MPI=MPIVIDE
+export VER_MPI=MPIINTEL
 #
 # OPTIMIZATION LEVEL
 #
 #export OPTLEVEL=DEBUG,O2
 #
-export OPTLEVEL=DEBUG
+export OPTLEVEL=O2
 #
 #  USER VERSION
 #
@@ -65,7 +65,7 @@ export MNH_NCWRIT=
 #
 # 'Scandollar' Post Processing default variables
 #
-export CONF_DOLLAR=/home/escj/DEV64/MNH-V5-2-0/conf/post/confdollar_aeropc_default
+export CONF_DOLLAR=/home/rchi421/DEV/MNH-V5-2-0/conf/post/confdollar_occigen_default
 #
 # Version of NETCDF / HDF
 #
@@ -138,4 +138,9 @@ export VARTTY=`tty`
 #
 # Optional Environnement variable/Module  Env
 #
+
+ulimit -s unlimited
+module load intel/15.0.0.090
+module load intelmpi/5.0.1.035
+export SLURM_CPU_BIND=none
  
-- 
GitLab