more LF, Id, and executable status changes
This commit is contained in:
Martin Diehl
parent
c254f87814
commit
188002f16e
|
|
@ -1,63 +1,63 @@
|
|||
Install MPIE modifications to use DAMASK_marc2010/11/12/13
|
||||
|
||||
Refer to http://damask.mpie.de for complete installation instructions.
|
||||
|
||||
Usually you will need to be root for this to work!
|
||||
|
||||
This is for the Linux64 version of Marc/Mentat2010(.2)/11/12/13(.1).
|
||||
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(_18)! The 2011/2012/2013 releases of Marc/Mentat relies on Intel Fortran 12.0! Make sure 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 or an other BLAS implementation (currently IMKL and LAPACK are supported) needs to be installed!
|
||||
Add acml path to LD_LIBRARY_PATH, to do so either use the script setup_shellrc.py in the installation folder or for a system wide setup edit /etc/csh.cshrc.local and/or /etc/bash.bashrc.local.
|
||||
Assuming ACML is installed in path ACMLDIR the path should read: /ACMLDIR/ifort64_mp/lib (this is the version using paralllization, ie openmp):
|
||||
for bash: LD_LIBRARY_PATH="/ACMLDIR/ifort64_mp/lib:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH
|
||||
for csh: setenv LD_LIBRARY_PATH /ACMLDIR/ifort64_mp/lib:${LD_LIBRARY_PATH}
|
||||
|
||||
As the apply_DAMASK_modifications script has to fix the path for the BLAS it needs to be installed in a place that can be accessed by all users of the system. In addition you have to specify the respective locations in DAMASK_ROOT/lib/pathInfo.
|
||||
|
||||
1) Install Marc, Mentat and Documentation as usual
|
||||
Run the test example including subroutines to confirm that the installation of both Marc/Mentat and the Intel Fortran Compiler is ok!
|
||||
2) Run the apply_DAMASK_modifications script from this directory.
|
||||
|
||||
|
||||
APPENDIX:
|
||||
|
||||
The structure of this directory should be (VERSION = 2010 or 2010.2 or 2011 or 2012 or 2013):
|
||||
|
||||
./installation.txt this text
|
||||
./apply_MPIE_modifications script file to apply modifications to the installation
|
||||
./VERSION/Marc_tools/comp_user.org original file from installation
|
||||
./VERSION/Marc_tools/comp_damask modified version using -O1 optimization
|
||||
./VERSION/Marc_tools/comp_damask_l modified version using -O0 optimization
|
||||
./VERSION/Marc_tools/comp_damask_h modified version using -O2 optimization
|
||||
./VERSION/Marc_tools/comp_damask_mp modified version using -O1 optimization and OpenMP
|
||||
./VERSION/Marc_tools/comp_damask_lmp modified version using -O0 optimization and OpenMP
|
||||
./VERSION/Marc_tools/comp_damask_hmp modified version using -O2 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_marc.org original file from installation
|
||||
./VERSION/Marc_tools/run_damask modified version using -O1 optimization
|
||||
./VERSION/Marc_tools/run_damask_l modified version using -O0 optimization
|
||||
./VERSION/Marc_tools/run_damask_h modified version using -O2 optimization
|
||||
./VERSION/Marc_tools/run_damask_mp modified version using -O1 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_damask_lmp modified version using -O0 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_damask_hmp modified version using -O2 optimization and OpenMP
|
||||
./VERSION/Marc_tools/include_linux64.org original file from installation
|
||||
./VERSION/Marc_tools/include_linux64 modified version
|
||||
./VERSION/Mentat_bin/edit_window.org original file from installation
|
||||
./VERSION/Mentat_bin/edit_window modified version
|
||||
./VERSION/Mentat_bin/submit1.org original file from installation
|
||||
./VERSION/Mentat_bin/submit4 modified version of original calling run_h_marc
|
||||
./VERSION/Mentat_bin/submit5 modified version of original calling run_marc
|
||||
./VERSION/Mentat_bin/submit6 modified version of original calling run_l_marc
|
||||
./VERSION/Mentat_bin/submit7 modified version of original calling run_hmp_marc
|
||||
./VERSION/Mentat_bin/submit8 modified version of original calling run_mp_marc
|
||||
./VERSION/Mentat_bin/submit9 modified version of original calling run_lmp_marc
|
||||
./VERSION/Mentat_bin/kill4 kill file for submit4, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill5 kill file for submit5, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill6 kill file for submit6, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill7 kill file for submit7, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill8 kill file for submit8, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill9 kill file for submit9, identical to original kill1
|
||||
./VERSION/Mentat_menus/job_run.ms.org original file from installation
|
||||
./VERSION/Mentat_menus/job_run.ms modified version
|
||||
Install MPIE modifications to use DAMASK_marc2010/11/12/13
|
||||
|
||||
Refer to http://damask.mpie.de for complete installation instructions.
|
||||
|
||||
Usually you will need to be root for this to work!
|
||||
|
||||
This is for the Linux64 version of Marc/Mentat2010(.2)/11/12/13(.1).
|
||||
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(_18)! The 2011/2012/2013 releases of Marc/Mentat relies on Intel Fortran 12.0! Make sure 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 or an other BLAS implementation (currently IMKL and LAPACK are supported) needs to be installed!
|
||||
Add acml path to LD_LIBRARY_PATH, to do so either use the script setup_shellrc.py in the installation folder or for a system wide setup edit /etc/csh.cshrc.local and/or /etc/bash.bashrc.local.
|
||||
Assuming ACML is installed in path ACMLDIR the path should read: /ACMLDIR/ifort64_mp/lib (this is the version using paralllization, ie openmp):
|
||||
for bash: LD_LIBRARY_PATH="/ACMLDIR/ifort64_mp/lib:${LD_LIBRARY_PATH}"; export LD_LIBRARY_PATH
|
||||
for csh: setenv LD_LIBRARY_PATH /ACMLDIR/ifort64_mp/lib:${LD_LIBRARY_PATH}
|
||||
|
||||
As the apply_DAMASK_modifications script has to fix the path for the BLAS it needs to be installed in a place that can be accessed by all users of the system. In addition you have to specify the respective locations in DAMASK_ROOT/lib/pathInfo.
|
||||
|
||||
1) Install Marc, Mentat and Documentation as usual
|
||||
Run the test example including subroutines to confirm that the installation of both Marc/Mentat and the Intel Fortran Compiler is ok!
|
||||
2) Run the apply_DAMASK_modifications script from this directory.
|
||||
|
||||
|
||||
APPENDIX:
|
||||
|
||||
The structure of this directory should be (VERSION = 2010 or 2010.2 or 2011 or 2012 or 2013):
|
||||
|
||||
./installation.txt this text
|
||||
./apply_MPIE_modifications script file to apply modifications to the installation
|
||||
./VERSION/Marc_tools/comp_user.org original file from installation
|
||||
./VERSION/Marc_tools/comp_damask modified version using -O1 optimization
|
||||
./VERSION/Marc_tools/comp_damask_l modified version using -O0 optimization
|
||||
./VERSION/Marc_tools/comp_damask_h modified version using -O2 optimization
|
||||
./VERSION/Marc_tools/comp_damask_mp modified version using -O1 optimization and OpenMP
|
||||
./VERSION/Marc_tools/comp_damask_lmp modified version using -O0 optimization and OpenMP
|
||||
./VERSION/Marc_tools/comp_damask_hmp modified version using -O2 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_marc.org original file from installation
|
||||
./VERSION/Marc_tools/run_damask modified version using -O1 optimization
|
||||
./VERSION/Marc_tools/run_damask_l modified version using -O0 optimization
|
||||
./VERSION/Marc_tools/run_damask_h modified version using -O2 optimization
|
||||
./VERSION/Marc_tools/run_damask_mp modified version using -O1 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_damask_lmp modified version using -O0 optimization and OpenMP
|
||||
./VERSION/Marc_tools/run_damask_hmp modified version using -O2 optimization and OpenMP
|
||||
./VERSION/Marc_tools/include_linux64.org original file from installation
|
||||
./VERSION/Marc_tools/include_linux64 modified version
|
||||
./VERSION/Mentat_bin/edit_window.org original file from installation
|
||||
./VERSION/Mentat_bin/edit_window modified version
|
||||
./VERSION/Mentat_bin/submit1.org original file from installation
|
||||
./VERSION/Mentat_bin/submit4 modified version of original calling run_h_marc
|
||||
./VERSION/Mentat_bin/submit5 modified version of original calling run_marc
|
||||
./VERSION/Mentat_bin/submit6 modified version of original calling run_l_marc
|
||||
./VERSION/Mentat_bin/submit7 modified version of original calling run_hmp_marc
|
||||
./VERSION/Mentat_bin/submit8 modified version of original calling run_mp_marc
|
||||
./VERSION/Mentat_bin/submit9 modified version of original calling run_lmp_marc
|
||||
./VERSION/Mentat_bin/kill4 kill file for submit4, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill5 kill file for submit5, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill6 kill file for submit6, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill7 kill file for submit7, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill8 kill file for submit8, identical to original kill1
|
||||
./VERSION/Mentat_bin/kill9 kill file for submit9, identical to original kill1
|
||||
./VERSION/Mentat_menus/job_run.ms.org original file from installation
|
||||
./VERSION/Mentat_menus/job_run.ms modified version
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# $Id: material.py 1507 2012-05-24 16:00:32Z MPIE\t.elachkar $
|
||||
# $Id$
|
||||
import re
|
||||
|
||||
class Material():
|
||||
|
|
|
|||
|
|
@ -1,16 +1,16 @@
|
|||
# damask utility functions
|
||||
import math
|
||||
try:
|
||||
import numpy
|
||||
except:
|
||||
numpy=None
|
||||
|
||||
# Matlab like trigonometric functions that take and return angles in degrees.
|
||||
for f in ['cos', 'sin', 'tan']:
|
||||
if numpy:
|
||||
exec('def %sd(deg): return (numpy.%s(numpy.deg2rad(deg)))'%(f,f))
|
||||
exec('def a%sd(val): return (numpy.rad2deg(numpy.arc%s(val)))'%(f,f))
|
||||
else:
|
||||
exec('def %sd(deg): return (math.%s(deg/180.*math.pi))'%(f,f))
|
||||
exec('def a%sd(val): return (math.a%s(val)*180./math.pi)'%(f,f))
|
||||
|
||||
# damask utility functions
|
||||
import math
|
||||
try:
|
||||
import numpy
|
||||
except:
|
||||
numpy=None
|
||||
|
||||
# Matlab like trigonometric functions that take and return angles in degrees.
|
||||
for f in ['cos', 'sin', 'tan']:
|
||||
if numpy:
|
||||
exec('def %sd(deg): return (numpy.%s(numpy.deg2rad(deg)))'%(f,f))
|
||||
exec('def a%sd(val): return (numpy.rad2deg(numpy.arc%s(val)))'%(f,f))
|
||||
else:
|
||||
exec('def %sd(deg): return (math.%s(deg/180.*math.pi))'%(f,f))
|
||||
exec('def a%sd(val): return (math.a%s(val)*180./math.pi)'%(f,f))
|
||||
|
||||
|
|
|
|||
17
lib/pathinfo
17
lib/pathinfo
|
|
@ -1,17 +0,0 @@
|
|||
# $Id$
|
||||
# possible options are
|
||||
# IMKL base installation directory of Intel Math Kernel Library
|
||||
# ACML base installation directory of AMD Core Math Library
|
||||
# LAPACK base installation directory of (system) LAPACK Library
|
||||
# MSC base installation directory of MSC.Marc/Mentat
|
||||
# FFTW base installation directory of Fastest Fourier Transform in the West library
|
||||
# A relative path (./like/this) starts from $DAMASK_ROOT/lib/
|
||||
# Do NOT add any trailing /lib/ to the end
|
||||
# of the base installation path---this will be done automatically
|
||||
# Out of IMKL, ACML, LAPACK the first defined value is used to access BLAS functionality
|
||||
|
||||
IMKL
|
||||
ACML /opt/acml5.3.0
|
||||
LAPACK /usr
|
||||
FFTW /usr/local
|
||||
#MSC /msc
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
! Copyright 2011-2013 Max-Planck-Institut für Eisenforschung GmbH
|
||||
!
|
||||
! This file is part of DAMASK,
|
||||
! the Düsseldorf Advanced MAterial Simulation Kit.
|
||||
!
|
||||
! DAMASK is free software: you can redistribute it and/or modify
|
||||
! it under the terms of the GNU General Public License as published by
|
||||
! the Free Software Foundation, either version 3 of the License, or
|
||||
! (at your option) any later version.
|
||||
!
|
||||
! DAMASK is distributed in the hope that it will be useful,
|
||||
! but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
! GNU General Public License for more details.
|
||||
!
|
||||
! You should have received a copy of the GNU General Public License
|
||||
! along with DAMASK. If not, see <http://www.gnu.org/licenses/>.
|
||||
!
|
||||
!##############################################################
|
||||
|
|
@ -44,7 +44,7 @@ parser = OptionParser(option_class=extendableOption, usage='%prog [options] [fil
|
|||
Calculates the standard deviation of data in blocks of size 'packing' thus reducing the former resolution
|
||||
to resolution/packing. (Requires numpy.)
|
||||
|
||||
""" + string.replace('$Id: averageDown.py 1857 2012-10-31 10:06:11Z MPIE\m.diehl $','\n','\\n')
|
||||
""" + string.replace('$Id$','\n','\\n')
|
||||
)
|
||||
|
||||
parser.add_option('-c','--coordinates', dest='coords', type='string',\
|
||||
|
|
@ -97,7 +97,7 @@ for file in files:
|
|||
|
||||
table = damask.ASCIItable(file['input'],file['output'],False) # make unbuffered ASCII_table
|
||||
table.head_read() # read ASCII header info
|
||||
table.info_append(string.replace('$Id: averageDown.py 1857 2012-10-31 10:06:11Z MPIE\m.diehl $','\n','\\n') + \
|
||||
table.info_append(string.replace('$Id$','\n','\\n') + \
|
||||
'\t' + ' '.join(sys.argv[1:]))
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import os,sys,string,re,numpy,vtk
|
|||
import damask
|
||||
from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
|
||||
|
||||
scriptID = '$Id: vtk_addPointcloudData.py 2770 2013-12-09 15:58:35Z p.eisenlohr $'
|
||||
scriptID = '$Id$'
|
||||
scriptName = scriptID.split()[1]
|
||||
|
||||
#--------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ from vtk import *
|
|||
# --- input parsing
|
||||
|
||||
parser = OptionParser(usage='%prog [options] vtkfile', description = """
|
||||
""" + string.replace('$Id: $','\n','\\n')
|
||||
""" + string.replace('$Id$','\n','\\n')
|
||||
)
|
||||
|
||||
parser.add_option('-v','--vector', nargs=3, dest='vector', type='string', \
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import os,sys,string,re,numpy,vtk
|
|||
import damask
|
||||
from optparse import OptionParser, OptionGroup, Option, SUPPRESS_HELP
|
||||
|
||||
scriptID = '$Id: vtk_pointcloud.py 2748 2013-11-26 20:24:40Z MPIE\p.eisenlohr $'
|
||||
scriptID = '$Id$'
|
||||
scriptName = scriptID.split()[1]
|
||||
|
||||
#--------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
Loading…
Reference in New Issue