223031012
/
DAMASK_EICMD
mirror of https://github.com/achalhp/DAMASK_EICMD.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added LF=UNIX to a bunch of files

This commit is contained in:
Martin Diehl 2012-02-22 13:30:00 +00:00
parent d8ffc29236
commit d68a3d1869
11 changed files with 730 additions and 723 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/DAMASK_spectral_interface.f90
View File

@ -127,7 +127,6 @@ subroutine DAMASK_interface_init()
loadcaseParameter = '' ! should be empty loadcaseParameter = '' ! should be empty
loadcaseParameter(1:length)=commandLine(start:start+length) loadcaseParameter(1:length)=commandLine(start:start+length)
print*, loadcaseParameter
do i=1,len(commandLine) ! remove capitals do i=1,len(commandLine) ! remove capitals
if(64<iachar(commandLine(i:i)) .and. iachar(commandLine(i:i))<91) commandLine(i:i)& if(64<iachar(commandLine(i:i)) .and. iachar(commandLine(i:i))<91) commandLine(i:i)&
= achar(iachar(commandLine(i:i))+32) = achar(iachar(commandLine(i:i))+32)

4
code/crystallite.f90
View File

@ -592,7 +592,7 @@ do while (any(crystallite_subStep(:,:,FEsolving_execELem(1):FEsolving_execElem(2
#ifndef _OPENMP #ifndef _OPENMP
if (debug_verbosity > 4 & if (debug_verbosity > 4 &
.and. ((e == debug_e .and. i == debug_i .and. g == debug_g) .or. .not. debug_selectiveDebugger)) then .and. ((e == debug_e .and. i == debug_i .and. g == debug_g) .or. .not. debug_selectiveDebugger)) then
write(6,'(a,f10.8,a,f10.8,a)') '<< CRYST >> winding forward from ', & write(6,'(a,f12.8,a,f12.8,a)') '<< CRYST >> winding forward from ', &
crystallite_subFrac(g,i,e),' to current crystallite_subfrac ', & crystallite_subFrac(g,i,e),' to current crystallite_subfrac ', &
crystallite_subFrac(g,i,e)+crystallite_subStep(g,i,e),' in crystallite_stressAndItsTangent' crystallite_subFrac(g,i,e)+crystallite_subStep(g,i,e),' in crystallite_stressAndItsTangent'
write(6,*) write(6,*)
@ -637,7 +637,7 @@ do while (any(crystallite_subStep(:,:,FEsolving_execELem(1):FEsolving_execElem(2
#ifndef _OPENMP #ifndef _OPENMP
if (debug_verbosity > 4_pInt & if (debug_verbosity > 4_pInt &
.and. ((e == debug_e .and. i == debug_i .and. g == debug_g) .or. .not. debug_selectiveDebugger)) then .and. ((e == debug_e .and. i == debug_i .and. g == debug_g) .or. .not. debug_selectiveDebugger)) then
write(6,'(a,f10.8)') '<< CRYST >> cutback step in crystallite_stressAndItsTangent with new crystallite_subStep: ',& write(6,'(a,f12.8)') '<< CRYST >> cutback step in crystallite_stressAndItsTangent with new crystallite_subStep: ',&
crystallite_subStep(g,i,e) crystallite_subStep(g,i,e)
write(6,*) write(6,*)
endif endif

21
code/makefile
View File

@ -182,7 +182,6 @@ COMPILE_OPTIONS_gfortran :=-xf95-cpp-input\
-fall-intrinsics\ -fall-intrinsics\
-pedantic\ -pedantic\
-Warray-bounds\ -Warray-bounds\
-Wunused-parameter\
-Wampersand\ -Wampersand\
-Wno-tabs\ -Wno-tabs\
-Wcharacter-truncation\ -Wcharacter-truncation\
@ -190,8 +189,13 @@ COMPILE_OPTIONS_gfortran :=-xf95-cpp-input\
-Waliasing\ -Waliasing\
-Wconversion\ -Wconversion\
-Wsurprising\ -Wsurprising\
-Wunused-value\ -Wunderflow\
-Wunderflow -Wswitch\
-Wstrict-overflow\
-Wextra\
-Wattributes\
-Wunsafe-loop-optimizations\
-Wunused
#-xf95-cpp-input: preprocessor #-xf95-cpp-input: preprocessor
#-ffree-line-length-132: restrict line length to the standard 132 characters #-ffree-line-length-132: restrict line length to the standard 132 characters
@ -200,7 +204,6 @@ COMPILE_OPTIONS_gfortran :=-xf95-cpp-input\
#-fall-intrinsics: #-fall-intrinsics:
#-pedantic: more strict on standard, enables some of the warnings below #-pedantic: more strict on standard, enables some of the warnings below
#-Warray-bounds: checks if array reference is out of bounds at compile time. use -fcheck-bounds to also check during runtime #-Warray-bounds: checks if array reference is out of bounds at compile time. use -fcheck-bounds to also check during runtime
#-Wunused-parameter: find usused variables with "parameter" attribute
#-Wampersand: checks if a character expression is continued proberly by an ampersand at the end of the line and at the beginning of the new line #-Wampersand: checks if a character expression is continued proberly by an ampersand at the end of the line and at the beginning of the new line
#-Wno-tabs: do not allow tabs in source #-Wno-tabs: do not allow tabs in source
#-Wcharacter-truncation: warn if character expressions (strings) are truncated #-Wcharacter-truncation: warn if character expressions (strings) are truncated
@ -209,14 +212,20 @@ COMPILE_OPTIONS_gfortran :=-xf95-cpp-input\
#-Wconversion: warn about implicit conversions between different type #-Wconversion: warn about implicit conversions between different type
#-Wsurprising: warn when "suspicious" code constructs are encountered. While technically legal these usually indicate that an error has been made. #-Wsurprising: warn when "suspicious" code constructs are encountered. While technically legal these usually indicate that an error has been made.
#-Wunused-value: #-Wunused-value:
#-Wunused-parameter: find usused variables with "parameter" attribute
#-Wunderflow: produce a warning when numerical constant expressions are encountered, which yield an UNDERFLOW during compilation #-Wunderflow: produce a warning when numerical constant expressions are encountered, which yield an UNDERFLOW during compilation
# #-Wswitch: warn whenever a "switch" statement has an index of enumerated type and lacks a "case" for one or more of the named codes of that
# enumeration. (The presence of a "default" label prevents this warning.) "case" labels outside the enumeration range also provoke
# warnings when this option is used (even if there is a "default" label)
#-Wstrict-overflow
#-Wattributes Warn about inappropriate attribute usage
# -Wunsafe-loop-optimizations Warn if the loop cannot be optimized due to nontrivial assumptions.
################################################################################################### ###################################################################################################
#OPTIONS FOR GFORTRAN 4.6 #OPTIONS FOR GFORTRAN 4.6
#-Wsuggest-attribute=const: #-Wsuggest-attribute=const:
#-Wsuggest-attribute=noreturn: #-Wsuggest-attribute=noreturn:
#-Wsuggest-attribute=pure: #-Wsuggest-attribute=pure:
# #-Wreal-q-constant: Warn about real-literal-constants with 'q' exponent-letter
#MORE OPTIONS FOR DEBUGGING DURING COMPILING #MORE OPTIONS FOR DEBUGGING DURING COMPILING
#-Wline-truncation: too many warnings because we have comments beyond character 132 #-Wline-truncation: too many warnings because we have comments beyond character 132
#-Wintrinsic-std: warnings because of "flush" is not longer in the standard, but still an intrinsic fuction of the compilers: #-Wintrinsic-std: warnings because of "flush" is not longer in the standard, but still an intrinsic fuction of the compilers:

2
copyright header.txt
View File

@ -1,4 +1,4 @@
! Copyright 2011 Max-Planck-Institut für Eisenforschung GmbH ! Copyright 2011,2012 Max-Planck-Institut für Eisenforschung GmbH
! !
! This file is part of DAMASK, ! This file is part of DAMASK,
! the Düsseldorf Advanced MAterial Simulation Kit. ! the Düsseldorf Advanced MAterial Simulation Kit.

1
processing/post/addCalculation.py
View File

@ -42,7 +42,6 @@ parser.add_option('-f','--formula', dest='formulas', action='extend', type='stri
parser.set_defaults(labels= []) parser.set_defaults(labels= [])
parser.set_defaults(formulas= []) parser.set_defaults(formulas= [])
parser.set_defaults(counter= False)
(options,filenames) = parser.parse_args() (options,filenames) = parser.parse_args()

18
processing/post/spectral_parseLog.py
View File

@ -35,18 +35,18 @@ parsing = [ \
['error_stress', r'^error stress = [ +-eE0123456789.]+ \( ([+-eE0123456789.]+)'], ['error_stress', r'^error stress = [ +-eE0123456789.]+ \( ([+-eE0123456789.]+)'],
['crit_divergence', r'^error divergence = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'], ['crit_divergence', r'^error divergence = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'],
['crit_stress', r'^error stress = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'], ['crit_stress', r'^error stress = ([ +-eE0123456789.]+) \( [+-eE0123456789.]+'],
['max(sym(deltaF))', r'^max symmetrix correction of deformation: ([ +-eE0123456789.]+)'], ['max(sym(deltaF))', r'^max symmetrix correction of deformation = ([ +-eE0123456789.]+)'],
['max(skew(deltaF))', r'^max skew correction of deformation: ([ +-eE0123456789.]+)'], ['max(skew(deltaF))', r'^max skew correction of deformation = ([ +-eE0123456789.]+)'],
['max(sym/skew(avg(deltaF)))', r'^max sym/skew of avg correction: ([ +-eE0123456789.]+)'], ['max(sym/skew(avg(deltaF)))', r'^max sym/skew of avg correction = ([ +-eE0123456789.]+)'],
['det(Fbar)', r'^determinant of new deformation: ([ +-eE0123456789.]+)'], ['det(Fbar)', r'^determinant of new deformation = ([ +-eE0123456789.]+)'],
['max(det(F))', r'^max determinant of deformation:([ +-eE0123456789.]+)'], ['max(det(F))', r'^max determinant of deformation = ([ +-eE0123456789.]+)'],
['min(det(F))', r'^min determinant of deformation:([ +-eE0123456789.]+)'], ['min(det(F))', r'^min determinant of deformation = ([ +-eE0123456789.]+)'],
['div_FT_max', r'^error divergence FT max = ([ +-eE0123456789.]+)'], ['div_FT_max', r'^error divergence FT max = ([ +-eE0123456789.]+)'],
['div_Real_RMS', r'^error divergence Real RMS = ([ +-eE0123456789.]+)'], ['div_Real_RMS', r'^error divergence Real RMS = ([ +-eE0123456789.]+)'],
['div_Real_max', r'^error divergence Real max = ([ +-eE0123456789.]+)'], ['div_Real_max', r'^error divergence Real max = ([ +-eE0123456789.]+)'],
['real(error_FT)', r'^max FT relative error ([ +-eE0123456789.]+) [ +-eE0123456789.]+'], ['real(error_FT)', r'^max FT relative error = ([ +-eE0123456789.]+) [ +-eE0123456789.]+'],
['img(error_FT)', r'^max FT relative error [ +-eE0123456789.]+ ([ +-eE0123456789.]+)'], ['img(error_FT)', r'^max FT relative error = [ +-eE0123456789.]+ ([ +-eE0123456789.]+)'],
['real(error_iFT)', r'^max iFT relative error ([ +-eE0123456789.]+)'], ['real(error_iFT)', r'^max iFT relative error = ([ +-eE0123456789.]+)'],
['error_postProc', r'^max deviat. from postProc =([ +-eE0123456789.]+)'], ['error_postProc', r'^max deviat. from postProc =([ +-eE0123456789.]+)'],
['loadcase', r'^Loadcase (\d+) Increment \d+/\d+ @ Iteration \d+/\d+'] ['loadcase', r'^Loadcase (\d+) Increment \d+/\d+ @ Iteration \d+/\d+']
] ]