From 40b4062b835c0fc246067dd26093e77b4ac5c150 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 6 Jul 2023 14:39:36 +0200 Subject: [PATCH 01/10] reshape to expected shape --- src/grid/grid_mech_spectral_basic.f90 | 12 +++++++----- src/grid/grid_mech_spectral_polarisation.f90 | 12 +++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/src/grid/grid_mech_spectral_basic.f90 b/src/grid/grid_mech_spectral_basic.f90 index 81d00db3f..f8b317b77 100644 --- a/src/grid/grid_mech_spectral_basic.f90 +++ b/src/grid/grid_mech_spectral_basic.f90 @@ -375,16 +375,17 @@ end subroutine grid_mechanical_spectral_basic_forward !-------------------------------------------------------------------------------------------------- -!> @brief Update coordinates +!> @brief Update coordinates. !-------------------------------------------------------------------------------------------------- -subroutine grid_mechanical_spectral_basic_updateCoords +subroutine grid_mechanical_spectral_basic_updateCoords() PetscErrorCode :: err_PETSc real(pREAL), dimension(:,:,:,:), pointer :: F + call DMDAVecGetArrayF90(da,solution_vec,F,err_PETSc) CHKERRQ(err_PETSc) - call utilities_updateCoords(F) + call utilities_updateCoords(reshape(F,[3,3,size(F,2),size(F,3),size(F,4)])) call DMDAVecRestoreArrayF90(da,solution_vec,F,err_PETSc) CHKERRQ(err_PETSc) @@ -392,14 +393,15 @@ end subroutine grid_mechanical_spectral_basic_updateCoords !-------------------------------------------------------------------------------------------------- -!> @brief Write current solver and constitutive data for restart to file +!> @brief Write current solver and constitutive data for restart to file. !-------------------------------------------------------------------------------------------------- -subroutine grid_mechanical_spectral_basic_restartWrite +subroutine grid_mechanical_spectral_basic_restartWrite() PetscErrorCode :: err_PETSc integer(HID_T) :: fileHandle, groupHandle real(pREAL), dimension(:,:,:,:), pointer :: F + call DMDAVecGetArrayF90(da,solution_vec,F,err_PETSc) CHKERRQ(err_PETSc) diff --git a/src/grid/grid_mech_spectral_polarisation.f90 b/src/grid/grid_mech_spectral_polarisation.f90 index 73d2b89f2..3db67a7b1 100644 --- a/src/grid/grid_mech_spectral_polarisation.f90 +++ b/src/grid/grid_mech_spectral_polarisation.f90 @@ -432,16 +432,17 @@ end subroutine grid_mechanical_spectral_polarisation_forward !-------------------------------------------------------------------------------------------------- -!> @brief Update coordinates +!> @brief Update coordinates. !-------------------------------------------------------------------------------------------------- -subroutine grid_mechanical_spectral_polarisation_updateCoords +subroutine grid_mechanical_spectral_polarisation_updateCoords() PetscErrorCode :: err_PETSc real(pREAL), dimension(:,:,:,:), pointer :: FandF_tau + call DMDAVecGetArrayF90(da,solution_vec,FandF_tau,err_PETSc) CHKERRQ(err_PETSc) - call utilities_updateCoords(FandF_tau(0:8,:,:,:)) + call utilities_updateCoords(reshape(FandF_tau(0:8,:,:,:),[3,3,size(FandF_tau,2),size(FandF_tau,3),size(FandF_tau,4)])) call DMDAVecRestoreArrayF90(da,solution_vec,FandF_tau,err_PETSc) CHKERRQ(err_PETSc) @@ -449,14 +450,15 @@ end subroutine grid_mechanical_spectral_polarisation_updateCoords !-------------------------------------------------------------------------------------------------- -!> @brief Write current solver and constitutive data for restart to file +!> @brief Write current solver and constitutive data for restart to file. !-------------------------------------------------------------------------------------------------- -subroutine grid_mechanical_spectral_polarisation_restartWrite +subroutine grid_mechanical_spectral_polarisation_restartWrite() PetscErrorCode :: err_PETSc integer(HID_T) :: fileHandle, groupHandle real(pREAL), dimension(:,:,:,:), pointer :: FandF_tau, F, F_tau + call DMDAVecGetArrayF90(da,solution_vec,FandF_tau,err_PETSc) CHKERRQ(err_PETSc) F => FandF_tau(0: 8,:,:,:) From 32810cbe8bd870d7cd83b257efc6c83c1dcd338a Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 11 Jul 2023 13:16:00 -0400 Subject: [PATCH 02/10] error formatting through function --- src/CLI.f90 | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/src/CLI.f90 b/src/CLI.f90 index f2575657c..d616ae5d2 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -158,36 +158,46 @@ subroutine CLI_init() print'(1x,a,/)',' Prints this message and exits' call quit(0) ! normal Termination case ('-g', '--geom', '--geometry') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --geom' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --geom') geomArg = getArg(i+1) case ('-l', '--load', '--loadcase') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --load' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --load') loadArg = getArg(i+1) case ('-m', '--material', '--materialconfig') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --material' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --material') materialArg = getArg(i+1) case ('-n', '--numerics', '--numericsconfig') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --numerics' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --numerics') numericsArg = getArg(i+1) case ('-j', '--job', '--jobname') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --jobname' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --jobname') solverJobname = getArg(i+1) case ('-w', '--wd', '--workingdir', '--workingdirectory') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --workingdirectory' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --workingdirectory') workingDirArg = getArg(i+1) case ('-r', '--rs', '--restart') - if (.not. hasArg) print'(/,1x,a)', 'ERROR: Missing argument for --restart' + if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --restart') arg = getArg(i+1) read(arg,*,iostat=stat) CLI_restartInc if (CLI_restartInc < 0 .or. stat /= 0) then - print'(/,1x,a)', 'ERROR: Could not parse restart increment: '//trim(arg) + print'(/,1x,a)', asError('could not parse restart increment: '//trim(arg)) call quit(1) end if end select end do - if (.not. all([allocated(loadArg),allocated(geomArg),allocated(materialArg)])) then - print'(/,1x,a)', 'ERROR: Please specify geometry AND load case AND material configuration (-h for help)' + if (.not. allocated(loadArg)) then + print'(/,1x,a)', asError('no load case specified (-h for help)') + call quit(1) + end if + + if (.not. allocated(geomArg)) then + print'(/,1x,a)', asError('no geometry specified (-h for help)') + call quit(1) + end if + + if (.not. allocated(materialArg)) then + print'(/,1x,a)', asError('no material configuration specified (-h for help)') call quit(1) end if @@ -201,7 +211,7 @@ subroutine CLI_init() if (.not. allocated(solverJobname)) then solverJobname = jobname(CLI_geomFile,CLI_loadFile,CLI_materialFile,CLI_numericsFile) elseif (scan(solverJobname,'/') > 0) then - print'(/,1x,a)', 'ERROR: JOBNAME must not contain any slashes' + print'(/,1x,a)', asError('JOBNAME must not contain any slashes') call quit(1) endif @@ -276,7 +286,7 @@ subroutine setWorkingDirectory(workingDirectoryArg) workingDirectory = trim(normpath(workingDirectory)) error = setCWD(trim(workingDirectory)) if (error) then - print'(1x,a)', 'ERROR: Invalid Working directory: '//trim(workingDirectory) + print'(1x,a)', asError('invalid Working directory: '//trim(workingDirectory)) call quit(1) end if @@ -343,7 +353,7 @@ function getPathRelCWD(path,fileType) inquire(file=getPathRelCWD, exist=file_exists) if (.not. file_exists) then - print'(/,1x,a)', 'ERROR: '//fileType//' file does not exist: '//trim(getPathRelCWD) + print'(/,1x,a)', asError(fileType//' file does not exist: '//trim(getPathRelCWD)) call quit(1) end if @@ -428,4 +438,18 @@ function relpath(path,start) end function relpath +!-------------------------------------------------------------------------------------------------- +!> @brief Prefix string with 'ERROR: ' and color it red. +!-------------------------------------------------------------------------------------------------- +function asError(str) + + character(len=*), intent(in) :: str + character(len=:), allocatable :: asError + + asError = 'ERROR: '//achar(27)//'[31m'//trim(str)//achar(27)//'[0m' + +end function asError + + + end module CLI From d452a9ce3f99b1eeb3a47963fbff13cd7999a2ff Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Tue, 11 Jul 2023 17:15:03 -0400 Subject: [PATCH 03/10] use IO_error in CLI --- src/CLI.f90 | 69 ++++++++++++----------------------------------------- src/IO.f90 | 48 ++++++++++++++++++++++++++++++------- 2 files changed, 54 insertions(+), 63 deletions(-) diff --git a/src/CLI.f90 b/src/CLI.f90 index d616ae5d2..a94cb2e60 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -74,7 +74,7 @@ subroutine CLI_init() print'(a)', achar(27)//'[31m' print'(1x,a,/)', 'debug version - debug version - debug version - debug version - debug version' #else - print'(a)', achar(27)//'[94m' + print'(a)', achar(27)//'[1;94m' #endif print'(1x,a)', ' _/_/_/ _/_/ _/ _/ _/_/ _/_/_/ _/ _/ _/_/_/' print'(1x,a)', ' _/ _/ _/ _/ _/_/ _/_/ _/ _/ _/ _/ _/ _/' @@ -158,48 +158,34 @@ subroutine CLI_init() print'(1x,a,/)',' Prints this message and exits' call quit(0) ! normal Termination case ('-g', '--geom', '--geometry') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --geom') + if (.not. hasArg) call IO_error(610) geomArg = getArg(i+1) case ('-l', '--load', '--loadcase') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --load') + if (.not. hasArg) call IO_error(611) loadArg = getArg(i+1) case ('-m', '--material', '--materialconfig') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --material') + if (.not. hasArg) call IO_error(612) materialArg = getArg(i+1) case ('-n', '--numerics', '--numericsconfig') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --numerics') + if (.not. hasArg) call IO_error(613) numericsArg = getArg(i+1) case ('-j', '--job', '--jobname') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --jobname') + if (.not. hasArg) call IO_error(614) solverJobname = getArg(i+1) case ('-w', '--wd', '--workingdir', '--workingdirectory') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --workingdirectory') + if (.not. hasArg) call IO_error(615) workingDirArg = getArg(i+1) case ('-r', '--rs', '--restart') - if (.not. hasArg) print'(/,1x,a)', asError('missing argument for --restart') + if (.not. hasArg) call IO_error(616) arg = getArg(i+1) read(arg,*,iostat=stat) CLI_restartInc - if (CLI_restartInc < 0 .or. stat /= 0) then - print'(/,1x,a)', asError('could not parse restart increment: '//trim(arg)) - call quit(1) - end if + if (CLI_restartInc < 0 .or. stat /= 0) call IO_error(617,ext_msg=arg) end select end do - if (.not. allocated(loadArg)) then - print'(/,1x,a)', asError('no load case specified (-h for help)') - call quit(1) - end if - - if (.not. allocated(geomArg)) then - print'(/,1x,a)', asError('no geometry specified (-h for help)') - call quit(1) - end if - - if (.not. allocated(materialArg)) then - print'(/,1x,a)', asError('no material configuration specified (-h for help)') - call quit(1) - end if + if (.not. allocated(geomArg)) call IO_error(620,ext_msg='-h for help') + if (.not. allocated(loadArg)) call IO_error(621,ext_msg='-h for help') + if (.not. allocated(materialArg)) call IO_error(622,ext_msg='-h for help') call setWorkingDirectory(trim(workingDirArg)) CLI_geomFile = getPathRelCWD(geomArg,'geometry') @@ -211,8 +197,7 @@ subroutine CLI_init() if (.not. allocated(solverJobname)) then solverJobname = jobname(CLI_geomFile,CLI_loadFile,CLI_materialFile,CLI_numericsFile) elseif (scan(solverJobname,'/') > 0) then - print'(/,1x,a)', asError('JOBNAME must not contain any slashes') - call quit(1) + call IO_error(630) endif commandLine = getArg(-1) @@ -272,9 +257,6 @@ subroutine setWorkingDirectory(workingDirectoryArg) character(len=*), intent(in) :: workingDirectoryArg !< working directory argument character(len=:), allocatable :: workingDirectory - logical :: error - external :: quit - absolutePath: if (workingDirectoryArg(1:1) == '/') then workingDirectory = workingDirectoryArg @@ -284,11 +266,7 @@ subroutine setWorkingDirectory(workingDirectoryArg) end if absolutePath workingDirectory = trim(normpath(workingDirectory)) - error = setCWD(trim(workingDirectory)) - if (error) then - print'(1x,a)', asError('invalid Working directory: '//trim(workingDirectory)) - call quit(1) - end if + if (setCWD(trim(workingDirectory))) call IO_error(640,ext_msg=workingDirectory) end subroutine setWorkingDirectory @@ -344,7 +322,6 @@ function getPathRelCWD(path,fileType) character(len=*), intent(in) :: fileType logical :: file_exists - external :: quit getPathRelCWD = trim(path) @@ -352,10 +329,7 @@ function getPathRelCWD(path,fileType) getPathRelCWD = trim(relpath(getPathRelCWD,getCWD())) inquire(file=getPathRelCWD, exist=file_exists) - if (.not. file_exists) then - print'(/,1x,a)', asError(fileType//' file does not exist: '//trim(getPathRelCWD)) - call quit(1) - end if + if (.not. file_exists) call IO_error(100,ext_msg=fileType//' "'//trim(getPathRelCWD)//'"') end function getPathRelCWD @@ -438,18 +412,5 @@ function relpath(path,start) end function relpath -!-------------------------------------------------------------------------------------------------- -!> @brief Prefix string with 'ERROR: ' and color it red. -!-------------------------------------------------------------------------------------------------- -function asError(str) - - character(len=*), intent(in) :: str - character(len=:), allocatable :: asError - - asError = 'ERROR: '//achar(27)//'[31m'//trim(str)//achar(27)//'[0m' - -end function asError - - end module CLI diff --git a/src/IO.f90 b/src/IO.f90 index 39a48e1e5..a0cf850b6 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -555,6 +555,34 @@ subroutine IO_error(error_ID,ext_msg,label1,ID1,label2,ID2) ! user errors case (603) msg = 'invalid data for table' + case (610) + msg = 'missing argument for --geom' + case (611) + msg = 'missing argument for --load' + case (612) + msg = 'missing argument for --material' + case (613) + msg = 'missing argument for --numerics' + case (614) + msg = 'missing argument for --jobname' + case (615) + msg = 'missing argument for --workingdirectory' + case (616) + msg = 'missing argument for --restart' + case (617) + msg = 'could not parse restart increment' + case (620) + msg = 'no geometry specified' + case (621) + msg = 'no load case specified' + case (622) + msg = 'no material configuration specified' + case (630) + msg = 'JOBNAME must not contain any slashes' + case (640) + msg = 'invalid working directory' + + !------------------------------------------------------------------------------------------------ ! errors related to YAML data @@ -622,9 +650,9 @@ subroutine IO_error(error_ID,ext_msg,label1,ID1,label2,ID2) end select call panel('error',error_ID,msg, & - ext_msg=ext_msg, & - label1=label1,ID1=ID1, & - label2=label2,ID2=ID2) + ext_msg=ext_msg, & + label1=label1,ID1=ID1, & + label2=label2,ID2=ID2) call quit(9000+error_ID) end subroutine IO_error @@ -704,6 +732,7 @@ subroutine panel(paneltype,ID,msg,ext_msg,label1,ID1,label2,ID2) character(len=pSTRLEN) :: formatString integer, parameter :: panelwidth = 69 + character(len=:), allocatable :: msg_,ID_ character(len=*), parameter :: DIVIDER = repeat('─',panelwidth) @@ -712,16 +741,17 @@ subroutine panel(paneltype,ID,msg,ext_msg,label1,ID1,label2,ID2) if ( present(label1) .and. .not. present(ID1)) error stop 'missing value for label 1' if ( present(label2) .and. .not. present(ID2)) error stop 'missing value for label 2' + if (paneltype == 'error') msg_ = achar(27)//'[31m'//trim(msg)//achar(27)//'[0m' + if (paneltype == 'warning') msg_ = achar(27)//'[33m'//trim(msg)//achar(27)//'[0m' + ID_ = IO_intAsStr(ID) !$OMP CRITICAL (write2out) write(IO_STDERR,'(/,a)') ' ┌'//DIVIDER//'┐' - write(formatString,'(a,i2,a)') '(a,24x,a,',max(1,panelwidth-24-len_trim(paneltype)),'x,a)' - write(IO_STDERR,formatString) ' │',trim(paneltype), '│' - write(formatString,'(a,i2,a)') '(a,24x,i3,',max(1,panelwidth-24-3),'x,a)' - write(IO_STDERR,formatString) ' │',ID, '│' + write(formatString,'(a,i2,a)') '(a,24x,a,1x,i0,',max(1,panelwidth-24-len_trim(paneltype)-1-len_trim(ID_)),'x,a)' + write(IO_STDERR,formatString) ' │',trim(paneltype),ID, '│' write(IO_STDERR,'(a)') ' ├'//DIVIDER//'┤' - write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a4,a',max(1,len_trim(msg)),',',& + write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a4,a',max(1,len_trim(msg_)),',',& max(1,panelwidth+3-len_trim(msg)-4),'x,a)' - write(IO_STDERR,formatString) '│ ',trim(msg), '│' + write(IO_STDERR,formatString) '│ ',trim(msg_), '│' if (present(ext_msg)) then write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a4,a',max(1,len_trim(ext_msg)),',',& max(1,panelwidth+3-len_trim(ext_msg)-4),'x,a)' From d9cf3983b49fc6a04139b32e79fff6ab44aa1354 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 12 Jul 2023 12:45:39 +0200 Subject: [PATCH 04/10] more generic error codes allow label without ID in IO_error --- src/CLI.f90 | 22 +++++++++++----------- src/IO.f90 | 45 ++++++++++++++++----------------------------- 2 files changed, 27 insertions(+), 40 deletions(-) diff --git a/src/CLI.f90 b/src/CLI.f90 index a94cb2e60..ce2f68ed7 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -158,34 +158,34 @@ subroutine CLI_init() print'(1x,a,/)',' Prints this message and exits' call quit(0) ! normal Termination case ('-g', '--geom', '--geometry') - if (.not. hasArg) call IO_error(610) + if (.not. hasArg) call IO_error(610,ext_msg='--geom') geomArg = getArg(i+1) case ('-l', '--load', '--loadcase') - if (.not. hasArg) call IO_error(611) + if (.not. hasArg) call IO_error(610,ext_msg='--load') loadArg = getArg(i+1) case ('-m', '--material', '--materialconfig') - if (.not. hasArg) call IO_error(612) + if (.not. hasArg) call IO_error(610,ext_msg='--material') materialArg = getArg(i+1) case ('-n', '--numerics', '--numericsconfig') - if (.not. hasArg) call IO_error(613) + if (.not. hasArg) call IO_error(610,ext_msg='--numerics') numericsArg = getArg(i+1) case ('-j', '--job', '--jobname') - if (.not. hasArg) call IO_error(614) + if (.not. hasArg) call IO_error(610,ext_msg='--jobname') solverJobname = getArg(i+1) case ('-w', '--wd', '--workingdir', '--workingdirectory') - if (.not. hasArg) call IO_error(615) + if (.not. hasArg) call IO_error(610,ext_msg='--workingdirectory') workingDirArg = getArg(i+1) case ('-r', '--rs', '--restart') - if (.not. hasArg) call IO_error(616) + if (.not. hasArg) call IO_error(610,ext_msg='--jobname') arg = getArg(i+1) read(arg,*,iostat=stat) CLI_restartInc - if (CLI_restartInc < 0 .or. stat /= 0) call IO_error(617,ext_msg=arg) + if (CLI_restartInc < 0 .or. stat /= 0) call IO_error(611,ext_msg=arg) end select end do - if (.not. allocated(geomArg)) call IO_error(620,ext_msg='-h for help') - if (.not. allocated(loadArg)) call IO_error(621,ext_msg='-h for help') - if (.not. allocated(materialArg)) call IO_error(622,ext_msg='-h for help') + if (.not. allocated(geomArg)) call IO_error(612,ext_msg='--help for instructions',label1='--geom') + if (.not. allocated(loadArg)) call IO_error(612,ext_msg='--help for instructions',label1='--load') + if (.not. allocated(materialArg)) call IO_error(612,ext_msg='--help for instructions',label1='--material') call setWorkingDirectory(trim(workingDirArg)) CLI_geomFile = getPathRelCWD(geomArg,'geometry') diff --git a/src/IO.f90 b/src/IO.f90 index a0cf850b6..86eb6558e 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -556,27 +556,11 @@ subroutine IO_error(error_ID,ext_msg,label1,ID1,label2,ID2) case (603) msg = 'invalid data for table' case (610) - msg = 'missing argument for --geom' + msg = 'no argument value specified' case (611) - msg = 'missing argument for --load' - case (612) - msg = 'missing argument for --material' - case (613) - msg = 'missing argument for --numerics' - case (614) - msg = 'missing argument for --jobname' - case (615) - msg = 'missing argument for --workingdirectory' - case (616) - msg = 'missing argument for --restart' - case (617) msg = 'could not parse restart increment' - case (620) - msg = 'no geometry specified' - case (621) - msg = 'no load case specified' - case (622) - msg = 'no material configuration specified' + case (612) + msg = 'missing argument' case (630) msg = 'JOBNAME must not contain any slashes' case (640) @@ -732,18 +716,21 @@ subroutine panel(paneltype,ID,msg,ext_msg,label1,ID1,label2,ID2) character(len=pSTRLEN) :: formatString integer, parameter :: panelwidth = 69 - character(len=:), allocatable :: msg_,ID_ + character(len=:), allocatable :: msg_,ID_,msg1,msg2 character(len=*), parameter :: DIVIDER = repeat('─',panelwidth) if (.not. present(label1) .and. present(ID1)) error stop 'missing label for value 1' if (.not. present(label2) .and. present(ID2)) error stop 'missing label for value 2' - if ( present(label1) .and. .not. present(ID1)) error stop 'missing value for label 1' - if ( present(label2) .and. .not. present(ID2)) error stop 'missing value for label 2' + + ID_ = IO_intAsStr(ID) + if (present(label1)) msg1 = label1 + if (present(label2)) msg2 = label2 + if (present(ID1)) msg1 = msg1//' '//IO_intAsStr(ID1) + if (present(ID2)) msg2 = msg2//' '//IO_intAsStr(ID2) if (paneltype == 'error') msg_ = achar(27)//'[31m'//trim(msg)//achar(27)//'[0m' if (paneltype == 'warning') msg_ = achar(27)//'[33m'//trim(msg)//achar(27)//'[0m' - ID_ = IO_intAsStr(ID) !$OMP CRITICAL (write2out) write(IO_STDERR,'(/,a)') ' ┌'//DIVIDER//'┐' write(formatString,'(a,i2,a)') '(a,24x,a,1x,i0,',max(1,panelwidth-24-len_trim(paneltype)-1-len_trim(ID_)),'x,a)' @@ -758,14 +745,14 @@ subroutine panel(paneltype,ID,msg,ext_msg,label1,ID1,label2,ID2) write(IO_STDERR,formatString) '│ ',trim(ext_msg), '│' end if if (present(label1)) then - write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a7,a',max(1,len_trim(label1)),',i9,',& - max(1,panelwidth+3-len_trim(label1)-9-7),'x,a)' - write(IO_STDERR,formatString) '│ at ',trim(label1),ID1, '│' + write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a7,a',max(1,len_trim(msg1)),',',& + max(1,panelwidth+3-len_trim(msg1)-7),'x,a)' + write(IO_STDERR,formatString) '│ at ',trim(msg1), '│' end if if (present(label2)) then - write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a7,a',max(1,len_trim(label2)),',i9,',& - max(1,panelwidth+3-len_trim(label2)-9-7),'x,a)' - write(IO_STDERR,formatString) '│ at ',trim(label2),ID2, '│' + write(formatString,'(a,i3.3,a,i3.3,a)') '(1x,a7,a',max(1,len_trim(msg2)),',',& + max(1,panelwidth+3-len_trim(msg2)-7),'x,a)' + write(IO_STDERR,formatString) '│ at ',trim(msg2), '│' end if write(formatString,'(a,i2.2,a)') '(a,',max(1,panelwidth),'x,a)' write(IO_STDERR,formatString) ' │', '│' From 159506b5e3113a112341e2b0b6a47d76d5bee059 Mon Sep 17 00:00:00 2001 From: Test User Date: Wed, 12 Jul 2023 18:27:26 +0200 Subject: [PATCH 05/10] [skip ci] updated version information after successful test of v3.0.0-alpha7-624-g61f1cdf70 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 772fa9b96..e29f03c21 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-614-gad6220c26 +3.0.0-alpha7-624-g61f1cdf70 From b235742472c083e7fe97183269f671ac763241ff Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Fri, 14 Jul 2023 10:23:23 -0400 Subject: [PATCH 06/10] clearer error messages --- src/CLI.f90 | 6 +++--- src/IO.f90 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/CLI.f90 b/src/CLI.f90 index ce2f68ed7..ed7fbcd5e 100644 --- a/src/CLI.f90 +++ b/src/CLI.f90 @@ -183,9 +183,9 @@ subroutine CLI_init() end select end do - if (.not. allocated(geomArg)) call IO_error(612,ext_msg='--help for instructions',label1='--geom') - if (.not. allocated(loadArg)) call IO_error(612,ext_msg='--help for instructions',label1='--load') - if (.not. allocated(materialArg)) call IO_error(612,ext_msg='--help for instructions',label1='--material') + if (.not. allocated(geomArg)) call IO_error(612,ext_msg='--geom') + if (.not. allocated(loadArg)) call IO_error(612,ext_msg='--load') + if (.not. allocated(materialArg)) call IO_error(612,ext_msg='--material') call setWorkingDirectory(trim(workingDirArg)) CLI_geomFile = getPathRelCWD(geomArg,'geometry') diff --git a/src/IO.f90 b/src/IO.f90 index 86eb6558e..0a8f7b07e 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -556,11 +556,11 @@ subroutine IO_error(error_ID,ext_msg,label1,ID1,label2,ID2) case (603) msg = 'invalid data for table' case (610) - msg = 'no argument value specified' + msg = 'missing argument for option' case (611) msg = 'could not parse restart increment' case (612) - msg = 'missing argument' + msg = 'missing option' case (630) msg = 'JOBNAME must not contain any slashes' case (640) From 7427b9b2d0c99e03841b0fc7180c10612467795d Mon Sep 17 00:00:00 2001 From: Philip Eisenlohr Date: Sat, 15 Jul 2023 18:53:12 +0000 Subject: [PATCH 07/10] Use universal Performance repository --- .gitlab-ci.yml | 27 ++++++++++++++++----------- PRIVATE | 2 +- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d24633468..15244cb24 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -196,7 +196,7 @@ Marc: ################################################################################################### -grid_runtime: +grid_performance: stage: statistics before_script: - ${LOCAL_HOME}/bin/queue ${CI_JOB_ID} --blocking @@ -210,22 +210,27 @@ grid_runtime: - export PATH=${PWD}/bin:${PATH} - cd $(mktemp -d) - git clone -q git@git.damask.mpie.de:damask/performance.git . + - ./measure_performance.py --input_dir ${CI_PROJECT_DIR}/examples/grid --tag ${CI_COMMIT_SHA} - > - ${CI_PROJECT_DIR}/PRIVATE/testing/runtime.py - --input_dir ${CI_PROJECT_DIR}/examples/grid - --output_dir ./ - --tag ${CI_COMMIT_SHA} - - if [ ${CI_COMMIT_BRANCH} == development ]; then git commit -am ${CI_PIPELINE_ID}_${CI_COMMIT_SHA}; git push; fi + if [ ${CI_COMMIT_BRANCH} == development ]; then + git add performance.txt + git commit -m ${CI_PIPELINE_ID}_${CI_COMMIT_SHA} + git push + fi -commit_history: +update_plots: stage: statistics script: - cd $(mktemp -d) - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 100 - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 1000 - - ${CI_PROJECT_DIR}/PRIVATE/testing/plot_commithistory.py --color green -n 5 -N 10000 + - git clone -q git@git.damask.mpie.de:damask/performance.git . + - ./plot_commithistory.py --color green -n 5 -N 100 + - ./plot_commithistory.py --color green -n 5 -N 1000 + - ./plot_commithistory.py --color green -n 5 -N 10000 - scp -r ./commits_*.html damask3.mpie.de:~/ - - ssh damask3.mpie.de "./update_statistics.sh" + - ssh damask3.mpie.de "./update_statistics_commits.sh" + - ./plot_performance.py --template=xgridoff + - scp -r ./runtime.html ./memory.html damask3.mpie.de:~/ + - ssh damask3.mpie.de "./update_statistics_performance.sh" only: - development diff --git a/PRIVATE b/PRIVATE index d61d62667..39853f7d8 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit d61d62667fb683a61dcc41cd90194a2d9b279879 +Subproject commit 39853f7d8fb06bb0c83aed5083212bcfd5b52a57 From 15b490fd876db5613aac8dd5a1034ecf024cbd36 Mon Sep 17 00:00:00 2001 From: Test User Date: Sat, 15 Jul 2023 23:05:01 +0200 Subject: [PATCH 08/10] [skip ci] updated version information after successful test of v3.0.0-alpha7-630-ga63fe8d02 --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index e29f03c21..07e7a9689 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -3.0.0-alpha7-624-g61f1cdf70 +3.0.0-alpha7-630-ga63fe8d02 From e1630e4057896047d956da2724277df3397a143a Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Sat, 15 Jul 2023 20:28:57 +0200 Subject: [PATCH 09/10] consistent naming with Python module --- src/CMakeLists.txt | 2 +- src/IO.f90 | 2 +- src/Marc/DAMASK_Marc.f90 | 2 +- src/Marc/materialpoint_Marc.f90 | 4 +- src/{lattice.f90 => crystal.f90} | 316 +++++++++--------- src/homogenization.f90 | 2 +- src/homogenization_mechanical_RGC.f90 | 4 +- src/materialpoint.f90 | 4 +- src/phase.f90 | 4 +- src/phase_damage_anisobrittle.f90 | 2 +- ...hase_mechanical_eigen_thermalexpansion.f90 | 2 +- src/phase_mechanical_elastic.f90 | 6 +- ...phase_mechanical_plastic_dislotungsten.f90 | 14 +- src/phase_mechanical_plastic_dislotwin.f90 | 36 +- ...phase_mechanical_plastic_kinehardening.f90 | 10 +- src/phase_mechanical_plastic_nonlocal.f90 | 20 +- ...phase_mechanical_plastic_phenopowerlaw.f90 | 22 +- src/phase_thermal.f90 | 2 +- 18 files changed, 227 insertions(+), 227 deletions(-) rename src/{lattice.f90 => crystal.f90} (94%) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2cf442bf8..fc9217f31 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,7 +1,7 @@ # special flags for some files if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU") # long lines for interaction matrix - set_source_files_properties("lattice.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") + set_source_files_properties("crystal.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-240") set_source_files_properties("parallelization.f90" PROPERTIES COMPILE_FLAGS "-ffree-line-length-none") endif() diff --git a/src/IO.f90 b/src/IO.f90 index 39a48e1e5..e1b9f4578 100644 --- a/src/IO.f90 +++ b/src/IO.f90 @@ -476,7 +476,7 @@ subroutine IO_error(error_ID,ext_msg,label1,ID1,label2,ID2) case (131) msg = 'hex lattice structure with invalid c/a ratio' case (132) - msg = 'trans_lattice_structure not possible' + msg = 'invalid parameters for transformation' case (134) msg = 'negative lattice parameter' case (135) diff --git a/src/Marc/DAMASK_Marc.f90 b/src/Marc/DAMASK_Marc.f90 index 032c77394..fc63a8ab1 100644 --- a/src/Marc/DAMASK_Marc.f90 +++ b/src/Marc/DAMASK_Marc.f90 @@ -155,7 +155,7 @@ end module DAMASK_interface #include "../rotations.f90" #include "../polynomials.f90" #include "../tables.f90" -#include "../lattice.f90" +#include "../crystal.f90" #include "element.f90" #include "../geometry_plastic_nonlocal.f90" #include "../discretization.f90" diff --git a/src/Marc/materialpoint_Marc.f90 b/src/Marc/materialpoint_Marc.f90 index 151b9c1d2..0e3835924 100644 --- a/src/Marc/materialpoint_Marc.f90 +++ b/src/Marc/materialpoint_Marc.f90 @@ -16,7 +16,7 @@ module materialpoint_Marc use rotations use polynomials use tables - use lattice + use crystal use material use phase use homogenization @@ -75,7 +75,7 @@ subroutine materialpoint_initAll() call rotations_init() call polynomials_init() call tables_init() - call lattice_init() + call crystal_init() call discretization_Marc_init() call material_init(.false.) call phase_init() diff --git a/src/lattice.f90 b/src/crystal.f90 similarity index 94% rename from src/lattice.f90 rename to src/crystal.f90 index c44e775db..724949180 100644 --- a/src/lattice.f90 +++ b/src/crystal.f90 @@ -3,10 +3,10 @@ !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @author Pratheek Shanthraj, Max-Planck-Institut für Eisenforschung GmbH !> @author Martin Diehl, Max-Planck-Institut für Eisenforschung GmbH -!> @brief contains lattice definitions including Schmid matrices for slip, twin, trans, -! and cleavage as well as interaction among the various systems +!> @brief Contains crystal definitions including Schmid matrices for slip, twin, trans, +! and cleavage as well as interaction among the various systems. !-------------------------------------------------------------------------------------------------- -module lattice +module crystal use prec use misc use IO @@ -80,7 +80,7 @@ module lattice ],pREAL),shape(CF_SYSTEMTWIN)) !< cF twin systems integer, dimension(2,CF_NTWIN), parameter, public :: & - lattice_CF_TWINNUCLEATIONSLIPPAIR = reshape( [& + crystal_CF_TWINNUCLEATIONSLIPPAIR = reshape( [& 2,3, & 1,3, & 1,2, & @@ -93,7 +93,7 @@ module lattice 11,12, & 10,12, & 10,11 & - ],shape(lattice_CF_TWINNUCLEATIONSLIPPAIR)) + ],shape(crystal_CF_TWINNUCLEATIONSLIPPAIR)) real(pREAL), dimension(3+3,CF_NCLEAVAGE), parameter :: & CF_SYSTEMCLEAVAGE = reshape(real([& @@ -367,60 +367,60 @@ module lattice ],pREAL),shape(TI_SYSTEMSLIP)) !< tI slip systems for c/a = 0.5456 (Sn), sorted by Bieler 2009 (https://doi.org/10.1007/s11664-009-0909-x) - interface lattice_forestProjection_edge + interface crystal_forestProjection_edge module procedure slipProjection_transverse - end interface lattice_forestProjection_edge + end interface crystal_forestProjection_edge - interface lattice_forestProjection_screw + interface crystal_forestProjection_screw module procedure slipProjection_direction - end interface lattice_forestProjection_screw + end interface crystal_forestProjection_screw public :: & - lattice_init, & - lattice_isotropic_nu, & - lattice_isotropic_mu, & - lattice_symmetrize_33, & - lattice_symmetrize_C66, & - lattice_SchmidMatrix_slip, & - lattice_SchmidMatrix_twin, & - lattice_SchmidMatrix_trans, & - lattice_SchmidMatrix_cleavage, & - lattice_nonSchmidMatrix, & - lattice_interaction_SlipBySlip, & - lattice_interaction_TwinByTwin, & - lattice_interaction_TransByTrans, & - lattice_interaction_SlipByTwin, & - lattice_interaction_SlipByTrans, & - lattice_interaction_TwinBySlip, & - lattice_characteristicShear_Twin, & - lattice_C66_twin, & - lattice_C66_trans, & - lattice_forestProjection_edge, & - lattice_forestProjection_screw, & - lattice_slip_normal, & - lattice_slip_direction, & - lattice_slip_transverse, & - lattice_labels_slip, & - lattice_labels_twin + crystal_init, & + crystal_isotropic_nu, & + crystal_isotropic_mu, & + crystal_symmetrize_33, & + crystal_symmetrize_C66, & + crystal_SchmidMatrix_slip, & + crystal_SchmidMatrix_twin, & + crystal_SchmidMatrix_trans, & + crystal_SchmidMatrix_cleavage, & + crystal_nonSchmidMatrix, & + crystal_interaction_SlipBySlip, & + crystal_interaction_TwinByTwin, & + crystal_interaction_TransByTrans, & + crystal_interaction_SlipByTwin, & + crystal_interaction_SlipByTrans, & + crystal_interaction_TwinBySlip, & + crystal_characteristicShear_Twin, & + crystal_C66_twin, & + crystal_C66_trans, & + crystal_forestProjection_edge, & + crystal_forestProjection_screw, & + crystal_slip_normal, & + crystal_slip_direction, & + crystal_slip_transverse, & + crystal_labels_slip, & + crystal_labels_twin contains !-------------------------------------------------------------------------------------------------- !> @brief Run self test. !-------------------------------------------------------------------------------------------------- -subroutine lattice_init() +subroutine crystal_init() - print'(/,1x,a)', '<<<+- lattice init -+>>>'; flush(IO_STDOUT) + print'(/,1x,a)', '<<<+- crystal init -+>>>'; flush(IO_STDOUT) call selfTest() -end subroutine lattice_init +end subroutine crystal_init !-------------------------------------------------------------------------------------------------- !> @brief Characteristic shear for twinning !-------------------------------------------------------------------------------------------------- -function lattice_characteristicShear_Twin(Ntwin,lattice,CoverA) result(characteristicShear) +function crystal_characteristicShear_Twin(Ntwin,lattice,CoverA) result(characteristicShear) integer, dimension(:), intent(in) :: Ntwin !< number of active twin systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -470,7 +470,7 @@ function lattice_characteristicShear_Twin(Ntwin,lattice,CoverA) result(character characteristicShear(a) = 0.5_pREAL*sqrt(2.0_pREAL) case('hP') if (cOverA < 1.0_pREAL .or. cOverA > 2.0_pREAL) & - call IO_error(131,ext_msg='lattice_characteristicShear_Twin') + call IO_error(131,ext_msg='crystal_characteristicShear_Twin') p = sum(HP_NTWINSYSTEM(1:f-1))+s select case(HP_SHEARTWIN(p)) ! from Christian & Mahajan 1995 p.29 case (1) ! <-10.1>{10.2} @@ -483,24 +483,24 @@ function lattice_characteristicShear_Twin(Ntwin,lattice,CoverA) result(character characteristicShear(a) = 2.0_pREAL*(cOverA**2-2.0_pREAL)/3.0_pREAL/cOverA end select case default - call IO_error(137,ext_msg='lattice_characteristicShear_Twin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_characteristicShear_Twin: '//trim(lattice)) end select end do mySystems end do myFamilies -end function lattice_characteristicShear_Twin +end function crystal_characteristicShear_Twin !-------------------------------------------------------------------------------------------------- !> @brief Rotated elasticity matrices for twinning in 6x6-matrix notation !-------------------------------------------------------------------------------------------------- -function lattice_C66_twin(Ntwin,C66,lattice,CoverA) +function crystal_C66_twin(Ntwin,C66,lattice,CoverA) integer, dimension(:), intent(in) :: Ntwin !< number of active twin systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) real(pREAL), dimension(6,6), intent(in) :: C66 !< unrotated parent stiffness matrix real(pREAL), intent(in) :: cOverA !< c/a ratio - real(pREAL), dimension(6,6,sum(Ntwin)) :: lattice_C66_twin + real(pREAL), dimension(6,6,sum(Ntwin)) :: crystal_C66_twin real(pREAL), dimension(3,3,sum(Ntwin)):: coordinateSystem type(tRotation) :: R @@ -518,28 +518,28 @@ function lattice_C66_twin(Ntwin,C66,lattice,CoverA) coordinateSystem = buildCoordinateSystem(Ntwin,HP_NSLIPSYSTEM,HP_SYSTEMTWIN,& lattice,cOverA) case default - call IO_error(137,ext_msg='lattice_C66_twin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_C66_twin: '//trim(lattice)) end select do i = 1, sum(Ntwin) call R%fromAxisAngle([coordinateSystem(1:3,2,i),PI],P=1) ! ToDo: Why always 180 deg? - lattice_C66_twin(1:6,1:6,i) = R%rotStiffness(C66) + crystal_C66_twin(1:6,1:6,i) = R%rotStiffness(C66) end do -end function lattice_C66_twin +end function crystal_C66_twin !-------------------------------------------------------------------------------------------------- !> @brief Rotated elasticity matrices for transformation in 6x6-matrix notation !-------------------------------------------------------------------------------------------------- -function lattice_C66_trans(Ntrans,C_parent66,lattice_target, & +function crystal_C66_trans(Ntrans,C_parent66,crystal_target, & cOverA_trans,a_cF,a_cI) integer, dimension(:), intent(in) :: Ntrans !< number of active twin systems per family - character(len=*), intent(in) :: lattice_target !< Bravais lattice (Pearson symbol) + character(len=*), intent(in) :: crystal_target !< Bravais lattice (Pearson symbol) real(pREAL), dimension(6,6), intent(in) :: C_parent66 real(pREAL), optional, intent(in) :: cOverA_trans, a_cF, a_cI - real(pREAL), dimension(6,6,sum(Ntrans)) :: lattice_C66_trans + real(pREAL), dimension(6,6,sum(Ntrans)) :: crystal_C66_trans real(pREAL), dimension(6,6) :: C_bar66, C_target_unrotated66 real(pREAL), dimension(3,3,sum(Ntrans)) :: Q,S @@ -548,11 +548,11 @@ function lattice_C66_trans(Ntrans,C_parent66,lattice_target, & !-------------------------------------------------------------------------------------------------- ! elasticity matrix of the target phase in cube orientation - if (lattice_target == 'hP' .and. present(cOverA_trans)) then + if (crystal_target == 'hP' .and. present(cOverA_trans)) then ! https://doi.org/10.1063/1.1663858 eq. (16), eq. (18), eq. (19) ! https://doi.org/10.1016/j.actamat.2016.07.032 eq. (47), eq. (48) if (cOverA_trans < 1.0_pREAL .or. cOverA_trans > 2.0_pREAL) & - call IO_error(131,ext_msg='lattice_C66_trans: '//trim(lattice_target)) + call IO_error(131,ext_msg='crystal_C66_trans: '//trim(crystal_target)) C_bar66(1,1) = (C_parent66(1,1) + C_parent66(1,2) + 2.0_pREAL*C_parent66(4,4))/2.0_pREAL C_bar66(1,2) = (C_parent66(1,1) + 5.0_pREAL*C_parent66(1,2) - 2.0_pREAL*C_parent66(4,4))/6.0_pREAL C_bar66(3,3) = (C_parent66(1,1) + 2.0_pREAL*C_parent66(1,2) + 4.0_pREAL*C_parent66(4,4))/3.0_pREAL @@ -566,13 +566,13 @@ function lattice_C66_trans(Ntrans,C_parent66,lattice_target, & C_target_unrotated66(1,3) = C_bar66(1,3) C_target_unrotated66(3,3) = C_bar66(3,3) C_target_unrotated66(4,4) = C_bar66(4,4) - C_bar66(1,4)**2/(0.5_pREAL*(C_bar66(1,1) - C_bar66(1,2))) - C_target_unrotated66 = lattice_symmetrize_C66(C_target_unrotated66,'hP') - elseif (lattice_target == 'cI' .and. present(a_cF) .and. present(a_cI)) then + C_target_unrotated66 = crystal_symmetrize_C66(C_target_unrotated66,'hP') + elseif (crystal_target == 'cI' .and. present(a_cF) .and. present(a_cI)) then if (a_cI <= 0.0_pREAL .or. a_cF <= 0.0_pREAL) & - call IO_error(134,ext_msg='lattice_C66_trans: '//trim(lattice_target)) + call IO_error(134,ext_msg='crystal_C66_trans: '//trim(crystal_target)) C_target_unrotated66 = C_parent66 else - call IO_error(137,ext_msg='lattice_C66_trans : '//trim(lattice_target)) + call IO_error(137,ext_msg='crystal_C66_trans : '//trim(crystal_target)) end if do i = 1,6 @@ -584,10 +584,10 @@ function lattice_C66_trans(Ntrans,C_parent66,lattice_target, & do i = 1,sum(Ntrans) call R%fromMatrix(Q(1:3,1:3,i)) - lattice_C66_trans(1:6,1:6,i) = R%rotStiffness(C_target_unrotated66) + crystal_C66_trans(1:6,1:6,i) = R%rotStiffness(C_target_unrotated66) end do - end function lattice_C66_trans + end function crystal_C66_trans !-------------------------------------------------------------------------------------------------- @@ -595,7 +595,7 @@ function lattice_C66_trans(Ntrans,C_parent66,lattice_target, & ! https://doi.org/10.1016/j.actamat.2012.03.053, eq. (17) ! https://doi.org/10.1016/j.actamat.2008.07.037, table 1 !-------------------------------------------------------------------------------------------------- -function lattice_nonSchmidMatrix(Nslip,nonSchmidCoefficients,sense) result(nonSchmidMatrix) +function crystal_nonSchmidMatrix(Nslip,nonSchmidCoefficients,sense) result(nonSchmidMatrix) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family real(pREAL), dimension(:), intent(in) :: nonSchmidCoefficients !< non-Schmid coefficients for projections @@ -608,11 +608,11 @@ function lattice_nonSchmidMatrix(Nslip,nonSchmidCoefficients,sense) result(nonSc integer :: i - if (abs(sense) /= 1) error stop 'Sense in lattice_nonSchmidMatrix' + if (abs(sense) /= 1) error stop 'Sense in crystal_nonSchmidMatrix' coordinateSystem = buildCoordinateSystem(Nslip,CI_NSLIPSYSTEM,CI_SYSTEMSLIP,'cI',0.0_pREAL) coordinateSystem(1:3,1,1:sum(Nslip)) = coordinateSystem(1:3,1,1:sum(Nslip))*real(sense,pREAL) ! convert unidirectional coordinate system - nonSchmidMatrix = lattice_SchmidMatrix_slip(Nslip,'cI',0.0_pREAL) ! Schmid contribution + nonSchmidMatrix = crystal_SchmidMatrix_slip(Nslip,'cI',0.0_pREAL) ! Schmid contribution do i = 1,sum(Nslip) direction = coordinateSystem(1:3,1,i) @@ -635,7 +635,7 @@ function lattice_nonSchmidMatrix(Nslip,nonSchmidCoefficients,sense) result(nonSc + nonSchmidCoefficients(6) * math_outer(direction, direction) end do -end function lattice_nonSchmidMatrix +end function crystal_nonSchmidMatrix !-------------------------------------------------------------------------------------------------- @@ -644,7 +644,7 @@ end function lattice_nonSchmidMatrix !> @details https://doi.org/10.1016/j.actamat.2016.12.040 (cF: Tab S4-1, cI: Tab S5-1) !> @details https://doi.org/10.1016/j.ijplas.2014.06.010 (hP: Tab 3b) !-------------------------------------------------------------------------------------------------- -function lattice_interaction_SlipBySlip(Nslip,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_SlipBySlip(Nslip,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family real(pREAL), dimension(:), intent(in) :: interactionValues !< values for slip-slip interaction @@ -950,19 +950,19 @@ function lattice_interaction_SlipBySlip(Nslip,interactionValues,lattice) result( interactionTypes = TI_INTERACTIONSLIPSLIP NslipMax = TI_NSLIPSYSTEM case default - call IO_error(137,ext_msg='lattice_interaction_SlipBySlip: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_SlipBySlip: '//trim(lattice)) end select interactionMatrix = buildInteraction(Nslip,Nslip,NslipMax,NslipMax,interactionValues,interactionTypes) -end function lattice_interaction_SlipBySlip +end function crystal_interaction_SlipBySlip !-------------------------------------------------------------------------------------------------- !> @brief Twin-twin interaction matrix !> details only active twin systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_interaction_TwinByTwin(Ntwin,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_TwinByTwin(Ntwin,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Ntwin !< number of active twin systems per family real(pREAL), dimension(:), intent(in) :: interactionValues !< values for twin-twin interaction @@ -1049,19 +1049,19 @@ function lattice_interaction_TwinByTwin(Ntwin,interactionValues,lattice) result( interactionTypes = HP_INTERACTIONTWINTWIN NtwinMax = HP_NTWINSYSTEM case default - call IO_error(137,ext_msg='lattice_interaction_TwinByTwin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_TwinByTwin: '//trim(lattice)) end select interactionMatrix = buildInteraction(Ntwin,Ntwin,NtwinMax,NtwinMax,interactionValues,interactionTypes) -end function lattice_interaction_TwinByTwin +end function crystal_interaction_TwinByTwin !-------------------------------------------------------------------------------------------------- !> @brief Trans-trans interaction matrix !> details only active trans systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_interaction_TransByTrans(Ntrans,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_TransByTrans(Ntrans,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Ntrans !< number of active trans systems per family real(pREAL), dimension(:), intent(in) :: interactionValues !< values for trans-trans interaction @@ -1091,19 +1091,19 @@ function lattice_interaction_TransByTrans(Ntrans,interactionValues,lattice) resu interactionTypes = CF_INTERACTIONTRANSTRANS NtransMax = CF_NTRANSSYSTEM else - call IO_error(137,ext_msg='lattice_interaction_TransByTrans: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_TransByTrans: '//trim(lattice)) end if interactionMatrix = buildInteraction(Ntrans,Ntrans,NtransMax,NtransMax,interactionValues,interactionTypes) -end function lattice_interaction_TransByTrans +end function crystal_interaction_TransByTrans !-------------------------------------------------------------------------------------------------- !> @brief Slip-twin interaction matrix !> details only active slip and twin systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_interaction_SlipByTwin(Nslip,Ntwin,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_SlipByTwin(Nslip,Ntwin,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Nslip, & !< number of active slip systems per family Ntwin !< number of active twin systems per family @@ -1251,19 +1251,19 @@ function lattice_interaction_SlipByTwin(Nslip,Ntwin,interactionValues,lattice) r NslipMax = HP_NSLIPSYSTEM NtwinMax = HP_NTWINSYSTEM case default - call IO_error(137,ext_msg='lattice_interaction_SlipByTwin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_SlipByTwin: '//trim(lattice)) end select interactionMatrix = buildInteraction(Nslip,Ntwin,NslipMax,NtwinMax,interactionValues,interactionTypes) -end function lattice_interaction_SlipByTwin +end function crystal_interaction_SlipByTwin !-------------------------------------------------------------------------------------------------- !> @brief Slip-trans interaction matrix !> details only active slip and trans systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_interaction_SlipByTrans(Nslip,Ntrans,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_SlipByTrans(Nslip,Ntrans,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Nslip, & !< number of active slip systems per family Ntrans !< number of active trans systems per family @@ -1304,19 +1304,19 @@ function lattice_interaction_SlipByTrans(Nslip,Ntrans,interactionValues,lattice) NslipMax = CF_NSLIPSYSTEM NtransMax = CF_NTRANSSYSTEM case default - call IO_error(137,ext_msg='lattice_interaction_SlipByTrans: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_SlipByTrans: '//trim(lattice)) end select interactionMatrix = buildInteraction(Nslip,Ntrans,NslipMax,NtransMax,interactionValues,interactionTypes) - end function lattice_interaction_SlipByTrans + end function crystal_interaction_SlipByTrans !-------------------------------------------------------------------------------------------------- !> @brief Twin-slip interaction matrix !> details only active twin and slip systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_interaction_TwinBySlip(Ntwin,Nslip,interactionValues,lattice) result(interactionMatrix) +function crystal_interaction_TwinBySlip(Ntwin,Nslip,interactionValues,lattice) result(interactionMatrix) integer, dimension(:), intent(in) :: Ntwin, & !< number of active twin systems per family Nslip !< number of active slip systems per family @@ -1380,19 +1380,19 @@ function lattice_interaction_TwinBySlip(Ntwin,Nslip,interactionValues,lattice) r NtwinMax = HP_NTWINSYSTEM NslipMax = HP_NSLIPSYSTEM case default - call IO_error(137,ext_msg='lattice_interaction_TwinBySlip: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_interaction_TwinBySlip: '//trim(lattice)) end select interactionMatrix = buildInteraction(Ntwin,Nslip,NtwinMax,NslipMax,interactionValues,interactionTypes) -end function lattice_interaction_TwinBySlip +end function crystal_interaction_TwinBySlip !-------------------------------------------------------------------------------------------------- !> @brief Schmid matrix for slip !> details only active slip systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_SchmidMatrix_slip(Nslip,lattice,cOverA) result(SchmidMatrix) +function crystal_SchmidMatrix_slip(Nslip,lattice,cOverA) result(SchmidMatrix) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1419,7 +1419,7 @@ function lattice_SchmidMatrix_slip(Nslip,lattice,cOverA) result(SchmidMatrix) slipSystems = TI_SYSTEMSLIP case default allocate(NslipMax(0)) - call IO_error(137,ext_msg='lattice_SchmidMatrix_slip: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_SchmidMatrix_slip: '//trim(lattice)) end select if (any(NslipMax(1:size(Nslip)) - Nslip < 0)) & @@ -1435,14 +1435,14 @@ function lattice_SchmidMatrix_slip(Nslip,lattice,cOverA) result(SchmidMatrix) error stop 'dilatational Schmid matrix for slip' end do -end function lattice_SchmidMatrix_slip +end function crystal_SchmidMatrix_slip !-------------------------------------------------------------------------------------------------- !> @brief Schmid matrix for twinning !> details only active twin systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_SchmidMatrix_twin(Ntwin,lattice,cOverA) result(SchmidMatrix) +function crystal_SchmidMatrix_twin(Ntwin,lattice,cOverA) result(SchmidMatrix) integer, dimension(:), intent(in) :: Ntwin !< number of active twin systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1466,7 +1466,7 @@ function lattice_SchmidMatrix_twin(Ntwin,lattice,cOverA) result(SchmidMatrix) twinSystems = HP_SYSTEMTWIN case default allocate(NtwinMax(0)) - call IO_error(137,ext_msg='lattice_SchmidMatrix_twin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_SchmidMatrix_twin: '//trim(lattice)) end select if (any(NtwinMax(1:size(Ntwin)) - Ntwin < 0)) & @@ -1482,43 +1482,43 @@ function lattice_SchmidMatrix_twin(Ntwin,lattice,cOverA) result(SchmidMatrix) error stop 'dilatational Schmid matrix for twin' end do -end function lattice_SchmidMatrix_twin +end function crystal_SchmidMatrix_twin !-------------------------------------------------------------------------------------------------- !> @brief Schmid matrix for transformation !> details only active twin systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_SchmidMatrix_trans(Ntrans,lattice_target,cOverA,a_cF,a_cI) result(SchmidMatrix) +function crystal_SchmidMatrix_trans(Ntrans,crystal_target,cOverA,a_cF,a_cI) result(SchmidMatrix) integer, dimension(:), intent(in) :: Ntrans !< number of active twin systems per family - character(len=*), intent(in) :: lattice_target !< Bravais lattice (Pearson symbol) + character(len=*), intent(in) :: crystal_target !< Bravais lattice (Pearson symbol) real(pREAL), optional, intent(in) :: cOverA, a_cI, a_cF real(pREAL), dimension(3,3,sum(Ntrans)) :: SchmidMatrix real(pREAL), dimension(3,3,sum(Ntrans)) :: devNull - if (lattice_target == 'hP' .and. present(cOverA)) then + if (crystal_target == 'hP' .and. present(cOverA)) then if (cOverA < 1.0_pREAL .or. cOverA > 2.0_pREAL) & - call IO_error(131,ext_msg='lattice_SchmidMatrix_trans: '//trim(lattice_target)) + call IO_error(131,ext_msg='crystal_SchmidMatrix_trans: '//trim(crystal_target)) call buildTransformationSystem(devNull,SchmidMatrix,Ntrans,cOverA=cOverA) - else if (lattice_target == 'cI' .and. present(a_cF) .and. present(a_cI)) then + else if (crystal_target == 'cI' .and. present(a_cF) .and. present(a_cI)) then if (a_cI <= 0.0_pREAL .or. a_cF <= 0.0_pREAL) & - call IO_error(134,ext_msg='lattice_SchmidMatrix_trans: '//trim(lattice_target)) + call IO_error(134,ext_msg='crystal_SchmidMatrix_trans: '//trim(crystal_target)) call buildTransformationSystem(devNull,SchmidMatrix,Ntrans,a_cF=a_cF,a_cI=a_cI) else - call IO_error(131,ext_msg='lattice_SchmidMatrix_trans: '//trim(lattice_target)) + call IO_error(131,ext_msg='crystal_SchmidMatrix_trans: '//trim(crystal_target)) end if -end function lattice_SchmidMatrix_trans +end function crystal_SchmidMatrix_trans !-------------------------------------------------------------------------------------------------- !> @brief Schmid matrix for cleavage !> details only active cleavage systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_SchmidMatrix_cleavage(Ncleavage,lattice,cOverA) result(SchmidMatrix) +function crystal_SchmidMatrix_cleavage(Ncleavage,lattice,cOverA) result(SchmidMatrix) integer, dimension(:), intent(in) :: Ncleavage !< number of active cleavage systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1539,7 +1539,7 @@ function lattice_SchmidMatrix_cleavage(Ncleavage,lattice,cOverA) result(SchmidMa cleavageSystems = CI_SYSTEMCLEAVAGE case default allocate(NcleavageMax(0)) - call IO_error(137,ext_msg='lattice_SchmidMatrix_cleavage: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_SchmidMatrix_cleavage: '//trim(lattice)) end select if (any(NcleavageMax(1:size(Ncleavage)) - Ncleavage < 0)) & @@ -1555,13 +1555,13 @@ function lattice_SchmidMatrix_cleavage(Ncleavage,lattice,cOverA) result(SchmidMa SchmidMatrix(1:3,1:3,3,i) = math_outer(coordinateSystem(1:3,2,i),coordinateSystem(1:3,2,i)) end do -end function lattice_SchmidMatrix_cleavage +end function crystal_SchmidMatrix_cleavage !-------------------------------------------------------------------------------------------------- !> @brief Slip direction of slip systems (|| b) !-------------------------------------------------------------------------------------------------- -function lattice_slip_direction(Nslip,lattice,cOverA) result(d) +function crystal_slip_direction(Nslip,lattice,cOverA) result(d) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1573,13 +1573,13 @@ function lattice_slip_direction(Nslip,lattice,cOverA) result(d) coordinateSystem = coordinateSystem_slip(Nslip,lattice,cOverA) d = coordinateSystem(1:3,1,1:sum(Nslip)) -end function lattice_slip_direction +end function crystal_slip_direction !-------------------------------------------------------------------------------------------------- !> @brief Normal direction of slip systems (|| n) !-------------------------------------------------------------------------------------------------- -function lattice_slip_normal(Nslip,lattice,cOverA) result(n) +function crystal_slip_normal(Nslip,lattice,cOverA) result(n) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1591,13 +1591,13 @@ function lattice_slip_normal(Nslip,lattice,cOverA) result(n) coordinateSystem = coordinateSystem_slip(Nslip,lattice,cOverA) n = coordinateSystem(1:3,2,1:sum(Nslip)) -end function lattice_slip_normal +end function crystal_slip_normal !-------------------------------------------------------------------------------------------------- !> @brief Transverse direction of slip systems (|| t = b x n) !-------------------------------------------------------------------------------------------------- -function lattice_slip_transverse(Nslip,lattice,cOverA) result(t) +function crystal_slip_transverse(Nslip,lattice,cOverA) result(t) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1609,14 +1609,14 @@ function lattice_slip_transverse(Nslip,lattice,cOverA) result(t) coordinateSystem = coordinateSystem_slip(Nslip,lattice,cOverA) t = coordinateSystem(1:3,3,1:sum(Nslip)) -end function lattice_slip_transverse +end function crystal_slip_transverse !-------------------------------------------------------------------------------------------------- !> @brief Labels of slip systems !> details only active slip systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_labels_slip(Nslip,lattice) result(labels) +function crystal_labels_slip(Nslip,lattice) result(labels) integer, dimension(:), intent(in) :: Nslip !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1640,7 +1640,7 @@ function lattice_labels_slip(Nslip,lattice) result(labels) NslipMax = TI_NSLIPSYSTEM slipSystems = TI_SYSTEMSLIP case default - call IO_error(137,ext_msg='lattice_labels_slip: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_labels_slip: '//trim(lattice)) end select if (any(NslipMax(1:size(Nslip)) - Nslip < 0)) & @@ -1650,13 +1650,13 @@ function lattice_labels_slip(Nslip,lattice) result(labels) labels = getLabels(Nslip,NslipMax,slipSystems) -end function lattice_labels_slip +end function crystal_labels_slip !-------------------------------------------------------------------------------------------------- !> @brief Return 3x3 tensor with symmetry according to given Bravais lattice !-------------------------------------------------------------------------------------------------- -pure function lattice_symmetrize_33(T,lattice) result(T_sym) +pure function crystal_symmetrize_33(T,lattice) result(T_sym) real(pREAL), dimension(3,3) :: T_sym @@ -1677,14 +1677,14 @@ pure function lattice_symmetrize_33(T,lattice) result(T_sym) T_sym(3,3) = T(3,3) end select -end function lattice_symmetrize_33 +end function crystal_symmetrize_33 !-------------------------------------------------------------------------------------------------- !> @brief Return stiffness matrix in 6x6 notation with symmetry according to given Bravais lattice !> @details J. A. Rayne and B. S. Chandrasekhar Phys. Rev. 120, 1658 Erratum Phys. Rev. 122, 1962 !-------------------------------------------------------------------------------------------------- -pure function lattice_symmetrize_C66(C66,lattice) result(C66_sym) +pure function crystal_symmetrize_C66(C66,lattice) result(C66_sym) real(pREAL), dimension(6,6) :: C66_sym @@ -1723,14 +1723,14 @@ pure function lattice_symmetrize_C66(C66,lattice) result(C66_sym) end do end do -end function lattice_symmetrize_C66 +end function crystal_symmetrize_C66 !-------------------------------------------------------------------------------------------------- !> @brief Labels for twin systems !> details only active twin systems are considered !-------------------------------------------------------------------------------------------------- -function lattice_labels_twin(Ntwin,lattice) result(labels) +function crystal_labels_twin(Ntwin,lattice) result(labels) integer, dimension(:), intent(in) :: Ntwin !< number of active slip systems per family character(len=*), intent(in) :: lattice !< Bravais lattice (Pearson symbol) @@ -1751,7 +1751,7 @@ function lattice_labels_twin(Ntwin,lattice) result(labels) NtwinMax = HP_NTWINSYSTEM twinSystems = HP_SYSTEMTWIN case default - call IO_error(137,ext_msg='lattice_labels_twin: '//trim(lattice)) + call IO_error(137,ext_msg='crystal_labels_twin: '//trim(lattice)) end select if (any(NtwinMax(1:size(Ntwin)) - Ntwin < 0)) & @@ -1761,7 +1761,7 @@ function lattice_labels_twin(Ntwin,lattice) result(labels) labels = getLabels(Ntwin,NtwinMax,twinSystems) -end function lattice_labels_twin +end function crystal_labels_twin !-------------------------------------------------------------------------------------------------- @@ -1778,8 +1778,8 @@ function slipProjection_transverse(Nslip,lattice,cOverA) result(projection) real(pREAL), dimension(3,sum(Nslip)) :: n, t integer :: i, j - n = lattice_slip_normal (Nslip,lattice,cOverA) - t = lattice_slip_transverse(Nslip,lattice,cOverA) + n = crystal_slip_normal (Nslip,lattice,cOverA) + t = crystal_slip_transverse(Nslip,lattice,cOverA) do i=1, sum(Nslip); do j=1, sum(Nslip) projection(i,j) = abs(math_inner(n(:,i),t(:,j))) @@ -1802,8 +1802,8 @@ function slipProjection_direction(Nslip,lattice,cOverA) result(projection) real(pREAL), dimension(3,sum(Nslip)) :: n, d integer :: i, j - n = lattice_slip_normal (Nslip,lattice,cOverA) - d = lattice_slip_direction(Nslip,lattice,cOverA) + n = crystal_slip_normal (Nslip,lattice,cOverA) + d = crystal_slip_direction(Nslip,lattice,cOverA) do i=1, sum(Nslip); do j=1, sum(Nslip) projection(i,j) = abs(math_inner(n(:,i),d(:,j))) @@ -2150,7 +2150,7 @@ end function getlabels !> @brief Equivalent Poisson's ratio (ν) !> @details https://doi.org/10.1143/JPSJ.20.635 !-------------------------------------------------------------------------------------------------- -pure function lattice_isotropic_nu(C,assumption,lattice) result(nu) +pure function crystal_isotropic_nu(C,assumption,lattice) result(nu) real(pREAL), dimension(6,6), intent(in) :: C !< Stiffness tensor (Voigt notation) character(len=*), intent(in) :: assumption !< Assumption (isostrain = 'Voigt', isostress = 'Reuss') @@ -2172,10 +2172,10 @@ pure function lattice_isotropic_nu(C,assumption,lattice) result(nu) error stop 'invalid assumption' end if - mu = lattice_isotropic_mu(C,assumption,lattice) + mu = crystal_isotropic_mu(C,assumption,lattice) nu = (1.5_pREAL*K-mu)/(3.0_pREAL*K+mu) -end function lattice_isotropic_nu +end function crystal_isotropic_nu !-------------------------------------------------------------------------------------------------- @@ -2183,7 +2183,7 @@ end function lattice_isotropic_nu !> @details https://doi.org/10.1143/JPSJ.20.635 !> @details Nonlinear Mechanics of Crystals 10.1007/978-94-007-0350-6, pp 563 !-------------------------------------------------------------------------------------------------- -pure function lattice_isotropic_mu(C,assumption,lattice) result(mu) +pure function crystal_isotropic_mu(C,assumption,lattice) result(mu) real(pREAL), dimension(6,6), intent(in) :: C !< Stiffness tensor (Voigt notation) character(len=*), intent(in) :: assumption !< Assumption (isostrain = 'Voigt', isostress = 'Reuss') @@ -2220,11 +2220,11 @@ pure function lattice_isotropic_mu(C,assumption,lattice) result(mu) error stop 'invalid assumption' end if -end function lattice_isotropic_mu +end function crystal_isotropic_mu !-------------------------------------------------------------------------------------------------- -!> @brief Check correctness of some lattice functions. +!> @brief Check correctness of some crystal functions. !-------------------------------------------------------------------------------------------------- subroutine selfTest @@ -2246,10 +2246,10 @@ subroutine selfTest do i = 1, 10 call random_number(C) - C_cF = lattice_symmetrize_C66(C,'cI') - C_cI = lattice_symmetrize_C66(C,'cF') - C_hP = lattice_symmetrize_C66(C,'hP') - C_tI = lattice_symmetrize_C66(C,'tI') + C_cF = crystal_symmetrize_C66(C,'cI') + C_cI = crystal_symmetrize_C66(C,'cF') + C_hP = crystal_symmetrize_C66(C,'hP') + C_tI = crystal_symmetrize_C66(C,'tI') if (any(dNeq(C_cI,transpose(C_cF)))) error stop 'SymmetryC66/cI-cF' if (any(dNeq(C_cF,transpose(C_cI)))) error stop 'SymmetryC66/cF-cI' @@ -2269,10 +2269,10 @@ subroutine selfTest if (any(dNeq(C(4,4),[C_tI(4,4),C_tI(5,5)]))) error stop 'SymmetryC_44-55/tI' call random_number(T) - T_cF = lattice_symmetrize_33(T,'cI') - T_cI = lattice_symmetrize_33(T,'cF') - T_hP = lattice_symmetrize_33(T,'hP') - T_tI = lattice_symmetrize_33(T,'tI') + T_cF = crystal_symmetrize_33(T,'cI') + T_cI = crystal_symmetrize_33(T,'cF') + T_hP = crystal_symmetrize_33(T,'hP') + T_tI = crystal_symmetrize_33(T,'tI') if (any(dNeq0(T_cF) .and. math_I3<1.0_pREAL)) error stop 'Symmetry33/c' if (any(dNeq0(T_hP) .and. math_I3<1.0_pREAL)) error stop 'Symmetry33/hP' @@ -2291,48 +2291,48 @@ subroutine selfTest C(4,4) = 0.5_pREAL * (C(1,1) - C(1,2)) C(6,6) = C(4,4) - C_cI = lattice_symmetrize_C66(C,'cI') - if (dNeq(C_cI(4,4),lattice_isotropic_mu(C_cI,'isostrain','cI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/cI' - if (dNeq(C_cI(4,4),lattice_isotropic_mu(C_cI,'isostress','cI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/cI' + C_cI = crystal_symmetrize_C66(C,'cI') + if (dNeq(C_cI(4,4),crystal_isotropic_mu(C_cI,'isostrain','cI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/cI' + if (dNeq(C_cI(4,4),crystal_isotropic_mu(C_cI,'isostress','cI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/cI' lambda = C_cI(1,2) - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_cI,'isostrain','cI')), & - lattice_isotropic_nu(C_cI,'isostrain','cI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/cI' - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_cI,'isostress','cI')), & - lattice_isotropic_nu(C_cI,'isostress','cI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/cI' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_cI,'isostrain','cI')), & + crystal_isotropic_nu(C_cI,'isostrain','cI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/cI' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_cI,'isostress','cI')), & + crystal_isotropic_nu(C_cI,'isostress','cI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/cI' - C_hP = lattice_symmetrize_C66(C,'hP') - if (dNeq(C(4,4),lattice_isotropic_mu(C_hP,'isostrain','hP'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/hP' - if (dNeq(C(4,4),lattice_isotropic_mu(C_hP,'isostress','hP'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/hP' + C_hP = crystal_symmetrize_C66(C,'hP') + if (dNeq(C(4,4),crystal_isotropic_mu(C_hP,'isostrain','hP'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/hP' + if (dNeq(C(4,4),crystal_isotropic_mu(C_hP,'isostress','hP'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/hP' lambda = C_hP(1,2) - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_hP,'isostrain','hP')), & - lattice_isotropic_nu(C_hP,'isostrain','hP'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/hP' - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_hP,'isostress','hP')), & - lattice_isotropic_nu(C_hP,'isostress','hP'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/hP' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_hP,'isostrain','hP')), & + crystal_isotropic_nu(C_hP,'isostrain','hP'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/hP' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_hP,'isostress','hP')), & + crystal_isotropic_nu(C_hP,'isostress','hP'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/hP' - C_tI = lattice_symmetrize_C66(C,'tI') - if (dNeq(C(6,6),lattice_isotropic_mu(C_tI,'isostrain','tI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/tI' - if (dNeq(C(6,6),lattice_isotropic_mu(C_tI,'isostress','tI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/tI' + C_tI = crystal_symmetrize_C66(C,'tI') + if (dNeq(C(6,6),crystal_isotropic_mu(C_tI,'isostrain','tI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostrain/tI' + if (dNeq(C(6,6),crystal_isotropic_mu(C_tI,'isostress','tI'),1.0e-12_pREAL)) error stop 'isotropic_mu/isostress/tI' lambda = C_tI(1,2) - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_tI,'isostrain','tI')), & - lattice_isotropic_nu(C_tI,'isostrain','tI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/tI' - if (dNeq(lambda*0.5_pREAL/(lambda+lattice_isotropic_mu(C_tI,'isostress','tI')), & - lattice_isotropic_nu(C_tI,'isostress','tI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/tI' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_tI,'isostrain','tI')), & + crystal_isotropic_nu(C_tI,'isostrain','tI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostrain/tI' + if (dNeq(lambda*0.5_pREAL/(lambda+crystal_isotropic_mu(C_tI,'isostress','tI')), & + crystal_isotropic_nu(C_tI,'isostress','tI'),1.0e-12_pREAL)) error stop 'isotropic_nu/isostress/tI' call random_number(C) - C = lattice_symmetrize_C66(C+math_eye(6),'cI') - if (dNeq(lattice_isotropic_mu(C,'isostrain','cI'), lattice_isotropic_mu(C,'isostrain','hP'), 1.0e-12_pREAL)) & + C = crystal_symmetrize_C66(C+math_eye(6),'cI') + if (dNeq(crystal_isotropic_mu(C,'isostrain','cI'), crystal_isotropic_mu(C,'isostrain','hP'), 1.0e-12_pREAL)) & error stop 'isotropic_mu/isostrain/cI-hP' - if (dNeq(lattice_isotropic_nu(C,'isostrain','cF'), lattice_isotropic_nu(C,'isostrain','cI'), 1.0e-12_pREAL)) & + if (dNeq(crystal_isotropic_nu(C,'isostrain','cF'), crystal_isotropic_nu(C,'isostrain','cI'), 1.0e-12_pREAL)) & error stop 'isotropic_nu/isostrain/cF-tI' - if (dNeq(lattice_isotropic_mu(C,'isostress','cI'), lattice_isotropic_mu(C,'isostress'), 1.0e-12_pREAL)) & + if (dNeq(crystal_isotropic_mu(C,'isostress','cI'), crystal_isotropic_mu(C,'isostress'), 1.0e-12_pREAL)) & error stop 'isotropic_mu/isostress/cI-hP' - if (dNeq(lattice_isotropic_nu(C,'isostress','cF'), lattice_isotropic_nu(C,'isostress'), 1.0e-12_pREAL)) & + if (dNeq(crystal_isotropic_nu(C,'isostress','cF'), crystal_isotropic_nu(C,'isostress'), 1.0e-12_pREAL)) & error stop 'isotropic_nu/isostress/cF-tI' end subroutine selfTest -end module lattice +end module crystal diff --git a/src/homogenization.f90 b/src/homogenization.f90 index f322c2c07..c85547917 100644 --- a/src/homogenization.f90 +++ b/src/homogenization.f90 @@ -16,7 +16,7 @@ module homogenization use HDF5 use HDF5_utilities use result - use lattice + use crystal implicit none(type,external) private diff --git a/src/homogenization_mechanical_RGC.f90 b/src/homogenization_mechanical_RGC.f90 index da8bce7c5..aac66ccec 100644 --- a/src/homogenization_mechanical_RGC.f90 +++ b/src/homogenization_mechanical_RGC.f90 @@ -8,7 +8,7 @@ !-------------------------------------------------------------------------------------------------- submodule(homogenization:mechanical) RGC use rotations - use lattice + use crystal type :: tParameters integer, dimension(:), allocatable :: & @@ -654,7 +654,7 @@ module function RGC_updateState(P,F,avgF,dt,dPdF,ce) result(doneAndHappy) C = phase_homogenizedC66(material_ID_phase(co,ce),material_entry_phase(co,ce)) ! damage not included! - equivalentMu = lattice_isotropic_mu(C,'isostrain') + equivalentMu = crystal_isotropic_mu(C,'isostrain') end function equivalentMu diff --git a/src/materialpoint.f90 b/src/materialpoint.f90 index ea02b1e6f..b92559a72 100644 --- a/src/materialpoint.f90 +++ b/src/materialpoint.f90 @@ -20,7 +20,7 @@ module materialpoint use rotations use polynomials use tables - use lattice + use crystal use material use phase use homogenization @@ -64,7 +64,7 @@ subroutine materialpoint_initAll() call rotations_init() call polynomials_init() call tables_init() - call lattice_init() + call crystal_init() #if defined(MESH) call discretization_mesh_init(restart=CLI_restartInc>0) #elif defined(GRID) diff --git a/src/phase.f90 b/src/phase.f90 index f889a854f..573e71069 100644 --- a/src/phase.f90 +++ b/src/phase.f90 @@ -14,7 +14,7 @@ module phase use config use material use result - use lattice + use crystal use discretization use parallelization use HDF5 @@ -336,7 +336,7 @@ module phase config, & material, & result, & - lattice, & + crystal, & discretization, & HDF5_utilities #endif diff --git a/src/phase_damage_anisobrittle.f90 b/src/phase_damage_anisobrittle.f90 index 788b8292c..e2ec9922c 100644 --- a/src/phase_damage_anisobrittle.f90 +++ b/src/phase_damage_anisobrittle.f90 @@ -77,7 +77,7 @@ module function anisobrittle_init() result(mySources) prm%s_crit = src%get_as1dReal('s_crit',requiredSize=size(N_cl)) prm%g_crit = src%get_as1dReal('g_crit',requiredSize=size(N_cl)) - prm%cleavage_systems = lattice_SchmidMatrix_cleavage(N_cl,phase_lattice(ph),phase_cOverA(ph)) + prm%cleavage_systems = crystal_SchmidMatrix_cleavage(N_cl,phase_lattice(ph),phase_cOverA(ph)) ! expand: family => system prm%s_crit = math_expand(prm%s_crit,N_cl) diff --git a/src/phase_mechanical_eigen_thermalexpansion.f90 b/src/phase_mechanical_eigen_thermalexpansion.f90 index 75a2ae0d0..027f71c81 100644 --- a/src/phase_mechanical_eigen_thermalexpansion.f90 +++ b/src/phase_mechanical_eigen_thermalexpansion.f90 @@ -92,7 +92,7 @@ module subroutine thermalexpansion_LiAndItsTangent(Li, dLi_dTstar, ph,me) Alpha = 0.0_pREAL Alpha(1,1) = prm%Alpha_11%at(T) if (any(phase_lattice(ph) == ['hP','tI'])) Alpha(3,3) = prm%Alpha_33%at(T) - Alpha = lattice_symmetrize_33(Alpha,phase_lattice(ph)) + Alpha = crystal_symmetrize_33(Alpha,phase_lattice(ph)) Li = dot_T * Alpha end associate diff --git a/src/phase_mechanical_elastic.f90 b/src/phase_mechanical_elastic.f90 index 75a8753a5..a2b5becff 100644 --- a/src/phase_mechanical_elastic.f90 +++ b/src/phase_mechanical_elastic.f90 @@ -97,7 +97,7 @@ pure module function elastic_C66(ph,en) result(C66) if (phase_lattice(ph) == 'tI') C66(6,6) = prm%C_66%at(T) - C66 = lattice_symmetrize_C66(C66,phase_lattice(ph)) + C66 = crystal_symmetrize_C66(C66,phase_lattice(ph)) end associate @@ -119,7 +119,7 @@ pure module function elastic_mu(ph,en,isotropic_bound) result(mu) associate(prm => param(ph)) - mu = lattice_isotropic_mu(elastic_C66(ph,en),isotropic_bound,phase_lattice(ph)) + mu = crystal_isotropic_mu(elastic_C66(ph,en),isotropic_bound,phase_lattice(ph)) end associate @@ -141,7 +141,7 @@ pure module function elastic_nu(ph,en,isotropic_bound) result(nu) associate(prm => param(ph)) - nu = lattice_isotropic_nu(elastic_C66(ph,en),isotropic_bound,phase_lattice(ph)) + nu = crystal_isotropic_nu(elastic_C66(ph,en),isotropic_bound,phase_lattice(ph)) end associate diff --git a/src/phase_mechanical_plastic_dislotungsten.f90 b/src/phase_mechanical_plastic_dislotungsten.f90 index 0dcd1cd84..08dd3decd 100644 --- a/src/phase_mechanical_plastic_dislotungsten.f90 +++ b/src/phase_mechanical_plastic_dislotungsten.f90 @@ -149,13 +149,13 @@ module function plastic_dislotungsten_init() result(myPlasticity) N_sl = pl%get_as1dInt('N_sl',defaultVal=emptyIntArray) prm%sum_N_sl = sum(abs(N_sl)) slipActive: if (prm%sum_N_sl > 0) then - prm%systems_sl = lattice_labels_slip(N_sl,phase_lattice(ph)) - prm%P_sl = lattice_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%systems_sl = crystal_labels_slip(N_sl,phase_lattice(ph)) + prm%P_sl = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then a = pl%get_as1dReal('a_nonSchmid',defaultVal = emptyRealArray) - prm%P_nS_pos = lattice_nonSchmidMatrix(N_sl,a,+1) - prm%P_nS_neg = lattice_nonSchmidMatrix(N_sl,a,-1) + prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) + prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1) else prm%P_nS_pos = prm%P_sl prm%P_nS_neg = prm%P_sl @@ -184,13 +184,13 @@ module function plastic_dislotungsten_init() result(myPlasticity) prm%d_caron = prm%b_sl * pl%get_asReal('D_a') prm%f_at = prm%b_sl**3*pl%get_asReal('f_at') - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'), & + prm%h_sl_sl = crystal_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'), & phase_lattice(ph)) prm%forestProjection = spread( f_edge,1,prm%sum_N_sl) & - * lattice_forestProjection_edge (N_sl,phase_lattice(ph),phase_cOverA(ph)) & + * crystal_forestProjection_edge (N_sl,phase_lattice(ph),phase_cOverA(ph)) & + spread(1.0_pREAL-f_edge,1,prm%sum_N_sl) & - * lattice_forestProjection_screw(N_sl,phase_lattice(ph),phase_cOverA(ph)) + * crystal_forestProjection_screw(N_sl,phase_lattice(ph),phase_cOverA(ph)) ! sanity checks if ( prm%D_0 < 0.0_pREAL) extmsg = trim(extmsg)//' D_0' diff --git a/src/phase_mechanical_plastic_dislotwin.f90 b/src/phase_mechanical_plastic_dislotwin.f90 index 9f221c910..a1f22baa7 100644 --- a/src/phase_mechanical_plastic_dislotwin.f90 +++ b/src/phase_mechanical_plastic_dislotwin.f90 @@ -73,7 +73,7 @@ submodule(phase:plastic) dislotwin integer, allocatable, dimension(:,:) :: & fcc_twinNucleationSlipPair ! ToDo: Better name? Is also used for trans character(len=:), allocatable :: & - lattice_tr, & + crystal_tr, & isotropic_bound character(len=pSTRLEN), allocatable, dimension(:) :: & output @@ -202,9 +202,9 @@ module function plastic_dislotwin_init() result(myPlasticity) N_sl = pl%get_as1dInt('N_sl',defaultVal=emptyIntArray) prm%sum_N_sl = sum(abs(N_sl)) slipActive: if (prm%sum_N_sl > 0) then - prm%systems_sl = lattice_labels_slip(N_sl,phase_lattice(ph)) - prm%P_sl = lattice_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) - prm%n0_sl = lattice_slip_normal(N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%systems_sl = crystal_labels_slip(N_sl,phase_lattice(ph)) + prm%P_sl = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%n0_sl = crystal_slip_normal(N_sl,phase_lattice(ph),phase_cOverA(ph)) prm%extendedDislocations = pl%get_asBool('extend_dislocations',defaultVal=.false.) prm%omitDipoles = pl%get_asBool('omit_dipoles', defaultVal=.false.) @@ -226,15 +226,15 @@ module function plastic_dislotwin_init() result(myPlasticity) defaultVal=[(0.0_pREAL,i=1,size(N_sl))]),N_sl) prm%d_caron = prm%b_sl * pl%get_asReal('D_a') - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'),phase_lattice(ph)) + prm%h_sl_sl = crystal_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'),phase_lattice(ph)) prm%forestProjection = spread( f_edge,1,prm%sum_N_sl) & - * lattice_forestProjection_edge (N_sl,phase_lattice(ph),phase_cOverA(ph)) & + * crystal_forestProjection_edge (N_sl,phase_lattice(ph),phase_cOverA(ph)) & + spread(1.0_pREAL-f_edge,1,prm%sum_N_sl) & - * lattice_forestProjection_screw(N_sl,phase_lattice(ph),phase_cOverA(ph)) + * crystal_forestProjection_screw(N_sl,phase_lattice(ph),phase_cOverA(ph)) prm%fccTwinTransNucleation = phase_lattice(ph) == 'cF' .and. N_sl(1) == 12 - if (prm%fccTwinTransNucleation) prm%fcc_twinNucleationSlipPair = lattice_CF_TWINNUCLEATIONSLIPPAIR + if (prm%fccTwinTransNucleation) prm%fcc_twinNucleationSlipPair = crystal_CF_TWINNUCLEATIONSLIPPAIR ! multiplication factor according to crystal structure (nearest neighbors bcc vs fcc/hex) ! details: Argon & Moffat, Acta Metallurgica, Vol. 29, pg 293 to 299, 1981 @@ -274,9 +274,9 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%N_tw = pl%get_as1dInt('N_tw', defaultVal=emptyIntArray) prm%sum_N_tw = sum(abs(prm%N_tw)) twinActive: if (prm%sum_N_tw > 0) then - prm%systems_tw = lattice_labels_twin(prm%N_tw,phase_lattice(ph)) - prm%P_tw = lattice_SchmidMatrix_twin(prm%N_tw,phase_lattice(ph),phase_cOverA(ph)) - prm%gamma_char_tw = lattice_characteristicShear_Twin(prm%N_tw,phase_lattice(ph),phase_cOverA(ph)) + prm%systems_tw = crystal_labels_twin(prm%N_tw,phase_lattice(ph)) + prm%P_tw = crystal_SchmidMatrix_twin(prm%N_tw,phase_lattice(ph),phase_cOverA(ph)) + prm%gamma_char_tw = crystal_characteristicShear_Twin(prm%N_tw,phase_lattice(ph),phase_cOverA(ph)) prm%L_tw = pl%get_asReal('L_tw') prm%i_tw = pl%get_asReal('i_tw') @@ -285,7 +285,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%t_tw = math_expand(pl%get_as1dReal('t_tw', requiredSize=size(prm%N_tw)),prm%N_tw) prm%r = math_expand(pl%get_as1dReal('p_tw', requiredSize=size(prm%N_tw)),prm%N_tw) - prm%h_tw_tw = lattice_interaction_TwinByTwin(prm%N_tw,pl%get_as1dReal('h_tw-tw'), & + prm%h_tw_tw = crystal_interaction_TwinByTwin(prm%N_tw,pl%get_as1dReal('h_tw-tw'), & phase_lattice(ph)) ! sanity checks @@ -309,7 +309,7 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%N_tr = pl%get_as1dInt('N_tr', defaultVal=emptyIntArray) prm%sum_N_tr = sum(abs(prm%N_tr)) transActive: if (prm%sum_N_tr > 0) then - prm%P_tr = lattice_SchmidMatrix_trans(prm%N_tr,'hP',prm%cOverA_hP) + prm%P_tr = crystal_SchmidMatrix_trans(prm%N_tr,'hP',prm%cOverA_hP) prm%Delta_G = polynomial(pl,'Delta_G','T') prm%i_tr = pl%get_asReal('i_tr') @@ -324,7 +324,7 @@ module function plastic_dislotwin_init() result(myPlasticity) a_cF = prm%b_tr(1)*sqrt(6.0_pREAL) ! b_tr is Shockley partial prm%h = 5.0_pREAL * a_cF/sqrt(3.0_pREAL) prm%rho = 4.0_pREAL/(sqrt(3.0_pREAL)*a_cF**2)/N_A - prm%h_tr_tr = lattice_interaction_TransByTrans(prm%N_tr,pl%get_as1dReal('h_tr-tr'),& + prm%h_tr_tr = crystal_interaction_TransByTrans(prm%N_tr,pl%get_as1dReal('h_tr-tr'),& phase_lattice(ph)) @@ -372,13 +372,13 @@ module function plastic_dislotwin_init() result(myPlasticity) prm%Gamma_sf = polynomial(pl,'Gamma_sf','T') slipAndTwinActive: if (prm%sum_N_sl * prm%sum_N_tw > 0) then - prm%h_sl_tw = lattice_interaction_SlipByTwin(N_sl,prm%N_tw,pl%get_as1dReal('h_sl-tw'), & + prm%h_sl_tw = crystal_interaction_SlipByTwin(N_sl,prm%N_tw,pl%get_as1dReal('h_sl-tw'), & phase_lattice(ph)) if (prm%fccTwinTransNucleation .and. size(prm%N_tw) /= 1) extmsg = trim(extmsg)//' N_tw: nucleation' end if slipAndTwinActive slipAndTransActive: if (prm%sum_N_sl * prm%sum_N_tr > 0) then - prm%h_sl_tr = lattice_interaction_SlipByTrans(N_sl,prm%N_tr,pl%get_as1dReal('h_sl-tr'), & + prm%h_sl_tr = crystal_interaction_SlipByTrans(N_sl,prm%N_tr,pl%get_as1dReal('h_sl-tr'), & phase_lattice(ph)) if (prm%fccTwinTransNucleation .and. size(prm%N_tr) /= 1) extmsg = trim(extmsg)//' N_tr: nucleation' end if slipAndTransActive @@ -480,7 +480,7 @@ module function plastic_dislotwin_homogenizedC(ph,en) result(homogenizedC) homogenizedC = f_matrix * C twinActive: if (prm%sum_N_tw > 0) then - C66_tw = lattice_C66_twin(prm%N_tw,C,phase_lattice(ph),phase_cOverA(ph)) + C66_tw = crystal_C66_twin(prm%N_tw,C,phase_lattice(ph),phase_cOverA(ph)) do i = 1, prm%sum_N_tw homogenizedC = homogenizedC & + stt%f_tw(i,en)*C66_tw(1:6,1:6,i) @@ -488,7 +488,7 @@ module function plastic_dislotwin_homogenizedC(ph,en) result(homogenizedC) end if twinActive transActive: if (prm%sum_N_tr > 0) then - C66_tr = lattice_C66_trans(prm%N_tr,C,'hP',prm%cOverA_hP) + C66_tr = crystal_C66_trans(prm%N_tr,C,'hP',prm%cOverA_hP) do i = 1, prm%sum_N_tr homogenizedC = homogenizedC & + stt%f_tr(i,en)*C66_tr(1:6,1:6,i) diff --git a/src/phase_mechanical_plastic_kinehardening.f90 b/src/phase_mechanical_plastic_kinehardening.f90 index 0bebe3368..153dc03d5 100644 --- a/src/phase_mechanical_plastic_kinehardening.f90 +++ b/src/phase_mechanical_plastic_kinehardening.f90 @@ -139,14 +139,14 @@ module function plastic_kinehardening_init() result(myPlasticity) N_sl = pl%get_as1dInt('N_sl',defaultVal=emptyIntArray) prm%sum_N_sl = sum(abs(N_sl)) slipActive: if (prm%sum_N_sl > 0) then - prm%systems_sl = lattice_labels_slip(N_sl,phase_lattice(ph)) - prm%P = lattice_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%systems_sl = crystal_labels_slip(N_sl,phase_lattice(ph)) + prm%P = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then a = pl%get_as1dReal('a_nonSchmid',defaultVal=emptyRealArray) prm%nonSchmidActive = size(a) > 0 - prm%P_nS_pos = lattice_nonSchmidMatrix(N_sl,a,+1) - prm%P_nS_neg = lattice_nonSchmidMatrix(N_sl,a,-1) + prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) + prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1) else prm%P_nS_pos = prm%P prm%P_nS_neg = prm%P @@ -155,7 +155,7 @@ module function plastic_kinehardening_init() result(myPlasticity) prm%dot_gamma_0 = pl%get_asReal('dot_gamma_0') prm%n = pl%get_asReal('n') - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'), & + prm%h_sl_sl = crystal_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'), & phase_lattice(ph)) xi_0 = math_expand(pl%get_as1dReal('xi_0', requiredSize=size(N_sl)),N_sl) diff --git a/src/phase_mechanical_plastic_nonlocal.f90 b/src/phase_mechanical_plastic_nonlocal.f90 index 4e45066b5..d436f1095 100644 --- a/src/phase_mechanical_plastic_nonlocal.f90 +++ b/src/phase_mechanical_plastic_nonlocal.f90 @@ -249,30 +249,30 @@ module function plastic_nonlocal_init() result(myPlasticity) ini%N_sl = pl%get_as1dInt('N_sl',defaultVal=emptyIntArray) prm%sum_N_sl = sum(abs(ini%N_sl)) slipActive: if (prm%sum_N_sl > 0) then - prm%systems_sl = lattice_labels_slip(ini%N_sl,phase_lattice(ph)) - prm%P_sl = lattice_SchmidMatrix_slip(ini%N_sl,phase_lattice(ph), phase_cOverA(ph)) + prm%systems_sl = crystal_labels_slip(ini%N_sl,phase_lattice(ph)) + prm%P_sl = crystal_SchmidMatrix_slip(ini%N_sl,phase_lattice(ph), phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then a = pl%get_as1dReal('a_nonSchmid',defaultVal = emptyRealArray) if (size(a) > 0) prm%nonSchmidActive = .true. - prm%P_nS_pos = lattice_nonSchmidMatrix(ini%N_sl,a,+1) - prm%P_nS_neg = lattice_nonSchmidMatrix(ini%N_sl,a,-1) + prm%P_nS_pos = crystal_nonSchmidMatrix(ini%N_sl,a,+1) + prm%P_nS_neg = crystal_nonSchmidMatrix(ini%N_sl,a,-1) else prm%P_nS_pos = prm%P_sl prm%P_nS_neg = prm%P_sl end if - prm%h_sl_sl = lattice_interaction_SlipBySlip(ini%N_sl,pl%get_as1dReal('h_sl-sl'), & + prm%h_sl_sl = crystal_interaction_SlipBySlip(ini%N_sl,pl%get_as1dReal('h_sl-sl'), & phase_lattice(ph)) - prm%forestProjection_edge = lattice_forestProjection_edge (ini%N_sl,phase_lattice(ph),& + prm%forestProjection_edge = crystal_forestProjection_edge (ini%N_sl,phase_lattice(ph),& phase_cOverA(ph)) - prm%forestProjection_screw = lattice_forestProjection_screw(ini%N_sl,phase_lattice(ph),& + prm%forestProjection_screw = crystal_forestProjection_screw(ini%N_sl,phase_lattice(ph),& phase_cOverA(ph)) - prm%slip_direction = lattice_slip_direction (ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) - prm%slip_transverse = lattice_slip_transverse(ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) - prm%slip_normal = lattice_slip_normal (ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%slip_direction = crystal_slip_direction (ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%slip_transverse = crystal_slip_transverse(ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%slip_normal = crystal_slip_normal (ini%N_sl,phase_lattice(ph),phase_cOverA(ph)) ! collinear systems (only for octahedral slip systems in fcc) allocate(prm%colinearSystem(prm%sum_N_sl), source = -1) diff --git a/src/phase_mechanical_plastic_phenopowerlaw.f90 b/src/phase_mechanical_plastic_phenopowerlaw.f90 index 1fcc5eb69..e9e28658b 100644 --- a/src/phase_mechanical_plastic_phenopowerlaw.f90 +++ b/src/phase_mechanical_plastic_phenopowerlaw.f90 @@ -149,21 +149,21 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) prm%h_int = math_expand(pl%get_as1dReal('h_int', requiredSize=size(N_sl), & defaultVal=[(0.0_pREAL,i=1,size(N_sl))]),N_sl) - prm%h_sl_sl = lattice_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'),phase_lattice(ph)) + prm%h_sl_sl = crystal_interaction_SlipBySlip(N_sl,pl%get_as1dReal('h_sl-sl'),phase_lattice(ph)) - prm%P_sl = lattice_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) + prm%P_sl = crystal_SchmidMatrix_slip(N_sl,phase_lattice(ph),phase_cOverA(ph)) if (phase_lattice(ph) == 'cI') then a = pl%get_as1dReal('a_nonSchmid',defaultVal=emptyRealArray) if (size(a) > 0) prm%nonSchmidActive = .true. - prm%P_nS_pos = lattice_nonSchmidMatrix(N_sl,a,+1) - prm%P_nS_neg = lattice_nonSchmidMatrix(N_sl,a,-1) + prm%P_nS_pos = crystal_nonSchmidMatrix(N_sl,a,+1) + prm%P_nS_neg = crystal_nonSchmidMatrix(N_sl,a,-1) else prm%P_nS_pos = prm%P_sl prm%P_nS_neg = prm%P_sl end if - prm%systems_sl = lattice_labels_slip(N_sl,phase_lattice(ph)) + prm%systems_sl = crystal_labels_slip(N_sl,phase_lattice(ph)) ! sanity checks if ( prm%dot_gamma_0_sl <= 0.0_pREAL) extmsg = trim(extmsg)//' dot_gamma_0_sl' @@ -196,11 +196,11 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) xi_0_tw = math_expand(pl%get_as1dReal('xi_0_tw',requiredSize=size(N_tw)),N_tw) - prm%gamma_char = lattice_characteristicShear_twin(N_tw,phase_lattice(ph),phase_cOverA(ph)) - prm%h_tw_tw = lattice_interaction_TwinByTwin(N_tw,pl%get_as1dReal('h_tw-tw'),phase_lattice(ph)) + prm%gamma_char = crystal_characteristicShear_twin(N_tw,phase_lattice(ph),phase_cOverA(ph)) + prm%h_tw_tw = crystal_interaction_TwinByTwin(N_tw,pl%get_as1dReal('h_tw-tw'),phase_lattice(ph)) - prm%P_tw = lattice_SchmidMatrix_twin(N_tw,phase_lattice(ph),phase_cOverA(ph)) - prm%systems_tw = lattice_labels_twin(N_tw,phase_lattice(ph)) + prm%P_tw = crystal_SchmidMatrix_twin(N_tw,phase_lattice(ph),phase_cOverA(ph)) + prm%systems_tw = crystal_labels_twin(N_tw,phase_lattice(ph)) ! sanity checks if (prm%dot_gamma_0_tw <= 0.0_pREAL) extmsg = trim(extmsg)//' dot_gamma_0_tw' @@ -216,9 +216,9 @@ module function plastic_phenopowerlaw_init() result(myPlasticity) ! slip-twin related parameters slipAndTwinActive: if (prm%sum_N_sl > 0 .and. prm%sum_N_tw > 0) then prm%h_0_tw_sl = pl%get_asReal('h_0_tw-sl') - prm%h_sl_tw = lattice_interaction_SlipByTwin(N_sl,N_tw,pl%get_as1dReal('h_sl-tw'), & + prm%h_sl_tw = crystal_interaction_SlipByTwin(N_sl,N_tw,pl%get_as1dReal('h_sl-tw'), & phase_lattice(ph)) - prm%h_tw_sl = lattice_interaction_TwinBySlip(N_tw,N_sl,pl%get_as1dReal('h_tw-sl'), & + prm%h_tw_sl = crystal_interaction_TwinBySlip(N_tw,N_sl,pl%get_as1dReal('h_tw-sl'), & phase_lattice(ph)) else slipAndTwinActive allocate(prm%h_sl_tw(prm%sum_N_sl,prm%sum_N_tw)) ! at least one dimension is 0 diff --git a/src/phase_thermal.f90 b/src/phase_thermal.f90 index 449e08ab8..5ef4dc7fd 100644 --- a/src/phase_thermal.f90 +++ b/src/phase_thermal.f90 @@ -112,7 +112,7 @@ module subroutine thermal_init(phases) param(ph)%C_p = thermal%get_asReal('C_p') param(ph)%K(1,1) = thermal%get_asReal('K_11') if (any(phase_lattice(ph) == ['hP','tI'])) param(ph)%K(3,3) = thermal%get_asReal('K_33') - param(ph)%K = lattice_symmetrize_33(param(ph)%K,phase_lattice(ph)) + param(ph)%K = crystal_symmetrize_33(param(ph)%K,phase_lattice(ph)) #if defined(__GFORTRAN__) param(ph)%output = output_as1dStr(thermal) From 6770bedb7d0bcd422d5262f831f7ab06f478b375 Mon Sep 17 00:00:00 2001 From: Sharan Roongta Date: Sun, 16 Jul 2023 15:38:37 +0200 Subject: [PATCH 10/10] point to development in PRIVATE --- PRIVATE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PRIVATE b/PRIVATE index 39853f7d8..1a5922536 160000 --- a/PRIVATE +++ b/PRIVATE @@ -1 +1 @@ -Subproject commit 39853f7d8fb06bb0c83aed5083212bcfd5b52a57 +Subproject commit 1a592253655a79ca26e29059339ed2bcb34eff9d