polarisation --> polarization
This commit is contained in:
Sharan
parent
054f548f4c
commit
45dd387527
|
|
@ -24,7 +24,7 @@ program DAMASK_grid
|
|||
use material
|
||||
use spectral_utilities
|
||||
use grid_mechanical_spectral_basic
|
||||
use grid_mechanical_spectral_polarisation
|
||||
use grid_mechanical_spectral_polarization
|
||||
use grid_mechanical_FEM
|
||||
use grid_damage_spectral
|
||||
use grid_thermal_spectral
|
||||
|
|
@ -173,11 +173,11 @@ program DAMASK_grid
|
|||
mechanical_restartWrite => grid_mechanical_spectral_basic_restartWrite
|
||||
|
||||
case ('spectral_polarization')
|
||||
mechanical_init => grid_mechanical_spectral_polarisation_init
|
||||
mechanical_forward => grid_mechanical_spectral_polarisation_forward
|
||||
mechanical_solution => grid_mechanical_spectral_polarisation_solution
|
||||
mechanical_updateCoords => grid_mechanical_spectral_polarisation_updateCoords
|
||||
mechanical_restartWrite => grid_mechanical_spectral_polarisation_restartWrite
|
||||
mechanical_init => grid_mechanical_spectral_polarization_init
|
||||
mechanical_forward => grid_mechanical_spectral_polarization_forward
|
||||
mechanical_solution => grid_mechanical_spectral_polarization_solution
|
||||
mechanical_updateCoords => grid_mechanical_spectral_polarization_updateCoords
|
||||
mechanical_restartWrite => grid_mechanical_spectral_polarization_restartWrite
|
||||
|
||||
case ('FEM')
|
||||
mechanical_init => grid_mechanical_FEM_init
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
!> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH
|
||||
!> @brief Grid solver for mechanics: Spectral Polarisation
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
module grid_mechanical_spectral_polarisation
|
||||
module grid_mechanical_spectral_polarization
|
||||
#include <petsc/finclude/petscsnes.h>
|
||||
#include <petsc/finclude/petscdmda.h>
|
||||
use PETScDMDA
|
||||
|
|
@ -103,18 +103,18 @@ module grid_mechanical_spectral_polarisation
|
|||
totalIter = 0 !< total iteration in current increment
|
||||
|
||||
public :: &
|
||||
grid_mechanical_spectral_polarisation_init, &
|
||||
grid_mechanical_spectral_polarisation_solution, &
|
||||
grid_mechanical_spectral_polarisation_forward, &
|
||||
grid_mechanical_spectral_polarisation_updateCoords, &
|
||||
grid_mechanical_spectral_polarisation_restartWrite
|
||||
grid_mechanical_spectral_polarization_init, &
|
||||
grid_mechanical_spectral_polarization_solution, &
|
||||
grid_mechanical_spectral_polarization_forward, &
|
||||
grid_mechanical_spectral_polarization_updateCoords, &
|
||||
grid_mechanical_spectral_polarization_restartWrite
|
||||
|
||||
contains
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief Allocate all necessary fields and fill them with data, potentially from restart info.
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine grid_mechanical_spectral_polarisation_init(num_grid)
|
||||
subroutine grid_mechanical_spectral_polarization_init(num_grid)
|
||||
|
||||
type(tDict), pointer, intent(in) :: num_grid
|
||||
|
||||
|
|
@ -292,13 +292,13 @@ subroutine grid_mechanical_spectral_polarisation_init(num_grid)
|
|||
C_scale = C_minMaxAvg
|
||||
S_scale = math_invSym3333(C_minMaxAvg)
|
||||
|
||||
end subroutine grid_mechanical_spectral_polarisation_init
|
||||
end subroutine grid_mechanical_spectral_polarization_init
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief solution for the Polarisation scheme with internal iterations
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
function grid_mechanical_spectral_polarisation_solution(incInfoIn) result(solution)
|
||||
function grid_mechanical_spectral_polarization_solution(incInfoIn) result(solution)
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
! input data for solution
|
||||
|
|
@ -333,14 +333,14 @@ function grid_mechanical_spectral_polarisation_solution(incInfoIn) result(soluti
|
|||
terminallyIll = .false.
|
||||
P_aim = merge(P_av,P_aim,params%stress_mask)
|
||||
|
||||
end function grid_mechanical_spectral_polarisation_solution
|
||||
end function grid_mechanical_spectral_polarization_solution
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief forwarding routine
|
||||
!> @details find new boundary conditions and best F estimate for end of current timestep
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine grid_mechanical_spectral_polarisation_forward(cutBack,guess,Delta_t,Delta_t_old,t_remaining,&
|
||||
subroutine grid_mechanical_spectral_polarization_forward(cutBack,guess,Delta_t,Delta_t_old,t_remaining,&
|
||||
deformation_BC,stress_BC,rotation_BC)
|
||||
|
||||
logical, intent(in) :: &
|
||||
|
|
@ -434,13 +434,13 @@ subroutine grid_mechanical_spectral_polarisation_forward(cutBack,guess,Delta_t,D
|
|||
params%rotation_BC = rotation_BC
|
||||
params%Delta_t = Delta_t
|
||||
|
||||
end subroutine grid_mechanical_spectral_polarisation_forward
|
||||
end subroutine grid_mechanical_spectral_polarization_forward
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief Update coordinates.
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine grid_mechanical_spectral_polarisation_updateCoords()
|
||||
subroutine grid_mechanical_spectral_polarization_updateCoords()
|
||||
|
||||
PetscErrorCode :: err_PETSc
|
||||
real(pREAL), dimension(:,:,:,:), pointer :: FandF_tau
|
||||
|
|
@ -451,13 +451,13 @@ subroutine grid_mechanical_spectral_polarisation_updateCoords()
|
|||
call DMDAVecRestoreArrayReadF90(da,solution_vec,FandF_tau,err_PETSc)
|
||||
CHKERRQ(err_PETSc)
|
||||
|
||||
end subroutine grid_mechanical_spectral_polarisation_updateCoords
|
||||
end subroutine grid_mechanical_spectral_polarization_updateCoords
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
!> @brief Write current solver and constitutive data for restart to file.
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine grid_mechanical_spectral_polarisation_restartWrite()
|
||||
subroutine grid_mechanical_spectral_polarization_restartWrite()
|
||||
|
||||
PetscErrorCode :: err_PETSc
|
||||
integer(HID_T) :: fileHandle, groupHandle
|
||||
|
|
@ -498,7 +498,7 @@ subroutine grid_mechanical_spectral_polarisation_restartWrite()
|
|||
call DMDAVecRestoreArrayReadF90(da,solution_vec,FandF_tau,err_PETSc)
|
||||
CHKERRQ(err_PETSc)
|
||||
|
||||
end subroutine grid_mechanical_spectral_polarisation_restartWrite
|
||||
end subroutine grid_mechanical_spectral_polarization_restartWrite
|
||||
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
|
|
@ -651,4 +651,4 @@ subroutine formResidual(residual_subdomain, FandF_tau, &
|
|||
|
||||
end subroutine formResidual
|
||||
|
||||
end module grid_mechanical_spectral_polarisation
|
||||
end module grid_mechanical_spectral_polarization
|
||||
Loading…
Reference in New Issue