From 60ef9d5ab0ac2c83f61557342992117a4bf42565 Mon Sep 17 00:00:00 2001
From: Franz	Roters <f.roters@mpie.de>
Date: Tue, 13 Sep 2011 07:58:54 +0000
Subject: [PATCH] updated installation instructions

---
 .../AMD Core Math Library/install.txt         |  4 ++-
 .../Marc_Mentat2010_mods/installation.txt     | 30 ++++++++++++++-----
 2 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/installation/AMD Core Math Library/install.txt b/installation/AMD Core Math Library/install.txt
index cc21d13a1..e5eeddd94 100644
--- a/installation/AMD Core Math Library/install.txt	
+++ b/installation/AMD Core Math Library/install.txt	
@@ -3,4 +3,6 @@ Install the AMD Core Math Library
 1. untar the tgz file to a local directory
 2. run the install script, use standard directory (/opt/acml4.4.0) for install otherwise run_marc scripts need to be adjusted
 3. add acml path to LD_LIBRARY_PATH, the best place to do so is: /etc/csh.cshrc.local and/or /etc/bash.bashrc.local
-   path should read: /opt/acml4.4.0/ifort64_mp/lib (this is the version using paralllization, ie openmp)
+   path should read: /opt/acml4.4.0/ifort64_mp/lib (this is the version using paralllization, ie openmp):
+   for bash: LD_LIBRARY_PATH="/opt/acml4.4.0/ifort64_mp/lib:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH
+   for csh: setenv LD_LIBRARY_PATH /opt/acml4.4.0/ifort64_mp/lib:${LD_LIBRARY_PATH}
diff --git a/installation/Marc_Mentat2010_mods/installation.txt b/installation/Marc_Mentat2010_mods/installation.txt
index efa7d0325..b2c15f260 100644
--- a/installation/Marc_Mentat2010_mods/installation.txt
+++ b/installation/Marc_Mentat2010_mods/installation.txt
@@ -1,11 +1,28 @@
-Install MPIE modifications to use MPIE CPFEM routine
-
-This is for the Linux64 version of Marc/Mentat2010(.2).
-The AMD Core Math Library needs to be installed in standard path /opt/acml4.4.0,
-otherwise the scripts run_marc run_h_marc and run_mp_marc need to be adopted!
+Install MPIE modifications to use DAMASK_marc2010
 
 Usually you will need to be root for this to work!
 
+This is for the Linux64 version of Marc/Mentat2010(.2).
+See Marc and Mentat Release Guide for List of Build and Supported Platforms!
+
+The Intel Fortran compiler needs to be installed. The 2010 release of Marc/Mentat relies on Intel Fortran 10.1!
+Make shure that ifort (the compiler executable) is in the PATH and that LD_LIBRARY_PATH is set correctly,
+refer to the Intel installation guide for instructions on how to do this.
+
+The AMD Core Math Library needs to be installed in the standard path /opt/acml4.4.0,
+otherwise the scripts run_marc run_h_marc and run_mp_marc need to be adopted accordingly!
+Add acml path to LD_LIBRARY_PATH, the best place to do so is: /etc/csh.cshrc.local and/or /etc/bash.bashrc.local
+The path should read: /opt/acml4.4.0/ifort64_mp/lib (this is the version using paralllization, ie openmp):
+for bash: LD_LIBRARY_PATH="/opt/acml4.4.0/ifort64_mp/lib:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH
+for csh: setenv LD_LIBRARY_PATH /opt/acml4.4.0/ifort64_mp/lib:${LD_LIBRARY_PATH}
+
+1) Install Marc, Mentat and Documentation as ususal
+   Run the test example including subroutines to make shure the installation of both Marc/Mentat and the Fortran Comnpiler is ok!
+2) Run the apply_MPIE_modifications script from this directory.
+
+
+APPENDIX:
+
 The structure of this directory should be (VERSION = 2010 or 2010.2):
 
 ./installation.txt						this text
@@ -30,6 +47,3 @@ The structure of this directory should be (VERSION = 2010 or 2010.2):
 ./VERSION/Mentat_bin/submit3					modified version of original calling run_mp_marc
 ./VERSION/Mentat_menus/job_run.ms.org			original file from installation
 ./VERSION/Mentat_menus/job_run.ms				modified version
-
-1) Install Marc, Mentat and Documentation as ususal
-2) Run the apply_MPIE_modifications script from this directory.