cleaning and debugging
This commit is contained in:
parent
18db5f5652
commit
b84476e681
|
@ -42,9 +42,9 @@ program DAMASK_FEM
|
|||
restartWrite, &
|
||||
restartInc
|
||||
use numerics, only: &
|
||||
worldrank, &
|
||||
maxCutBack, &
|
||||
stagItMax, &
|
||||
worldrank
|
||||
stagItMax
|
||||
use mesh, only: &
|
||||
mesh_Nboundaries, &
|
||||
mesh_boundaries, &
|
||||
|
@ -73,11 +73,7 @@ program DAMASK_FEM
|
|||
COMPONENT_SOLUTE_CVaH_ID, &
|
||||
COMPONENT_SOLUTE_CVaHPOT_ID, &
|
||||
COMPONENT_MGTWIN_PHI_ID, &
|
||||
FIELD_MECH_label, &
|
||||
FIELD_THERMAL_label, &
|
||||
FIELD_DAMAGE_label, &
|
||||
FIELD_SOLUTE_label, &
|
||||
FIELD_MGTWIN_label
|
||||
FIELD_MECH_label
|
||||
use FEM_mech
|
||||
|
||||
implicit none
|
||||
|
@ -405,18 +401,6 @@ program DAMASK_FEM
|
|||
case(FIELD_MECH_ID)
|
||||
write(6,'(2x,a)') 'Field '//trim(FIELD_MECH_label)
|
||||
|
||||
case(FIELD_THERMAL_ID)
|
||||
write(6,'(2x,a)') 'Field '//trim(FIELD_THERMAL_label)
|
||||
|
||||
case(FIELD_DAMAGE_ID)
|
||||
write(6,'(2x,a)') 'Field '//trim(FIELD_DAMAGE_label)
|
||||
|
||||
case(FIELD_MGTWIN_ID)
|
||||
write(6,'(2x,a)') 'Field '//trim(FIELD_MGTWIN_label)
|
||||
|
||||
case(FIELD_SOLUTE_ID)
|
||||
write(6,'(2x,a)') 'Field '//trim(FIELD_SOLUTE_label)
|
||||
|
||||
end select
|
||||
do faceSet = 1_pInt, mesh_Nboundaries
|
||||
do component = 1_pInt, loadCases(currentLoadCase)%fieldBC(field)%nComponents
|
||||
|
|
|
@ -23,9 +23,6 @@ module FEM_mech
|
|||
tSolutionState, &
|
||||
tFieldBC, &
|
||||
tComponentBC
|
||||
use numerics, only: &
|
||||
worldrank, &
|
||||
worldsize
|
||||
use mesh, only: &
|
||||
mesh_Nboundaries, &
|
||||
mesh_boundaries
|
||||
|
@ -64,7 +61,7 @@ module FEM_mech
|
|||
FEM_mech_solution ,&
|
||||
FEM_mech_forward, &
|
||||
FEM_mech_destroy
|
||||
|
||||
external :: PETScerrorf
|
||||
contains
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
|
@ -80,7 +77,6 @@ subroutine FEM_mech_init(fieldBC)
|
|||
use mesh, only: &
|
||||
geomMesh
|
||||
use numerics, only: &
|
||||
worldrank, &
|
||||
itmax, &
|
||||
integrationOrder
|
||||
use FEM_Zoo, only: &
|
||||
|
@ -672,6 +668,7 @@ end subroutine FEM_mech_forward
|
|||
!--------------------------------------------------------------------------------------------------
|
||||
subroutine FEM_mech_converged(snes_local,PETScIter,xnorm,snorm,fnorm,reason,dummy,ierr)
|
||||
use numerics, only: &
|
||||
worldrank, &
|
||||
err_struct_tolAbs, &
|
||||
err_struct_tolRel
|
||||
use IO, only: &
|
||||
|
|
|
@ -28,15 +28,12 @@ use PETScis
|
|||
!--------------------------------------------------------------------------------------------------
|
||||
! output data
|
||||
Vec, public :: coordinatesVec
|
||||
|
||||
!--------------------------------------------------------------------------------------------------
|
||||
! field labels information
|
||||
character(len=*), parameter, public :: &
|
||||
FIELD_MECH_label = 'mechanical', &
|
||||
FIELD_THERMAL_label = 'thermal', &
|
||||
FIELD_DAMAGE_label = 'damage', &
|
||||
FIELD_SOLUTE_label = 'solute', &
|
||||
FIELD_MGTWIN_label = 'mgtwin'
|
||||
FIELD_MECH_label = 'mechanical'
|
||||
|
||||
integer(pInt), parameter :: structOrder = 2_pInt
|
||||
|
||||
enum, bind(c)
|
||||
enumerator :: FIELD_UNDEFINED_ID, &
|
||||
|
@ -207,7 +204,7 @@ subroutine utilities_init()
|
|||
call PetscOptionsInsertString(PETSC_NULL_OPTIONS,trim(petsc_defaultOptions),ierr)
|
||||
call PetscOptionsInsertString(PETSC_NULL_OPTIONS,trim(petsc_options),ierr)
|
||||
CHKERRQ(ierr)
|
||||
!write(petsc_optionsPhysics,'(a,i0)') '-mechFE_petscspace_order ' , structOrder
|
||||
write(petsc_optionsPhysics,'(a,i0)') '-mechFE_petscspace_order ' , structOrder
|
||||
call PetscOptionsInsertString(PETSC_NULL_OPTIONS,trim(petsc_optionsPhysics),ierr)
|
||||
CHKERRQ(ierr)
|
||||
|
||||
|
|
Loading…
Reference in New Issue