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

Merge branch 'no-lc-for-parameters' into 'development' 

use consistently case-sensitive parameters

See merge request damask/DAMASK!858
This commit is contained in:
Sharan Roongta 2023-11-27 22:09:35 +00:00
parent 558ab1c98b 4d525c35bc
commit f02c1dc44a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/crystal.f90
View File

@ -2128,9 +2128,9 @@ pure function crystal_isotropic_nu(C,assumption,lattice) result(nu)
real(pREAL), dimension(6,6) :: S real(pREAL), dimension(6,6) :: S
if (IO_lc(assumption) == 'isostrain') then if (assumption == 'isostrain') then
K = sum(C(1:3,1:3)) / 9.0_pREAL K = sum(C(1:3,1:3)) / 9.0_pREAL
elseif (IO_lc(assumption) == 'isostress') then elseif (assumption == 'isostress') then
call math_invert(S,error,C) call math_invert(S,error,C)
if (error) error stop 'matrix inversion failed' if (error) error stop 'matrix inversion failed'
K = 1.0_pREAL / sum(S(1:3,1:3)) K = 1.0_pREAL / sum(S(1:3,1:3))
@ -2160,7 +2160,7 @@ pure function crystal_isotropic_mu(C,assumption,lattice) result(mu)
real(pREAL), dimension(6,6) :: S real(pREAL), dimension(6,6) :: S
if (IO_lc(assumption) == 'isostrain') then if (assumption == 'isostrain') then
select case(misc_optional(lattice,'')) select case(misc_optional(lattice,''))
case('cF','cI') case('cF','cI')
mu = ( C(1,1) - C(1,2) + C(4,4)*3.0_pREAL) / 5.0_pREAL mu = ( C(1,1) - C(1,2) + C(4,4)*3.0_pREAL) / 5.0_pREAL
@ -2171,7 +2171,7 @@ pure function crystal_isotropic_mu(C,assumption,lattice) result(mu)
) / 15.0_pREAL ) / 15.0_pREAL
end select end select
elseif (IO_lc(assumption) == 'isostress') then elseif (assumption == 'isostress') then
select case(misc_optional(lattice,'')) select case(misc_optional(lattice,''))
case('cF','cI') case('cF','cI')
mu = 5.0_pREAL & mu = 5.0_pREAL &

4
src/grid/spectral_utilities.f90
View File

@ -226,7 +226,7 @@ subroutine spectral_utilities_init()
scaledGeomSize = geomSize scaledGeomSize = geomSize
end if end if
select case(IO_lc(num_grid_fft%get_asStr('FFTW_plan_mode',defaultVal='FFTW_MEASURE'))) select case(num_grid_fft%get_asStr('FFTW_plan_mode',defaultVal='FFTW_MEASURE'))
case('fftw_estimate', 'FFTW_ESTIMATE') ! ordered from slow execution (but fast plan creation) to fast execution case('fftw_estimate', 'FFTW_ESTIMATE') ! ordered from slow execution (but fast plan creation) to fast execution
FFTW_planner_flag = FFTW_ESTIMATE FFTW_planner_flag = FFTW_ESTIMATE
case('fftw_measure', 'FFTW_MEASURE') case('fftw_measure', 'FFTW_MEASURE')
@ -236,7 +236,7 @@ subroutine spectral_utilities_init()
case('fftw_exhaustive', 'FFTW_EXHAUSTIVE') case('fftw_exhaustive', 'FFTW_EXHAUSTIVE')
FFTW_planner_flag = FFTW_EXHAUSTIVE FFTW_planner_flag = FFTW_EXHAUSTIVE
case default case default
call IO_warning(47,'using default FFTW_MEASURE instead of "'//trim(num_grid_fft%get_asStr('plan_mode'))//'"') call IO_warning(47,'using default FFTW_MEASURE instead of "'//trim(num_grid_fft%get_asStr('FFTW_plan_mode'))//'"')
FFTW_planner_flag = FFTW_MEASURE FFTW_planner_flag = FFTW_MEASURE
end select end select