From b775d5084b9423d7e6b893e3d5a52ab73cffd7de Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Thu, 20 Sep 2018 08:26:59 +0200 Subject: [PATCH] more (temporarly) cleaning --- src/FEM_utilities.f90 | 3 +-- src/numerics.f90 | 22 +--------------------- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/src/FEM_utilities.f90 b/src/FEM_utilities.f90 index 6242a4ebe..9b56df338 100644 --- a/src/FEM_utilities.f90 +++ b/src/FEM_utilities.f90 @@ -32,8 +32,6 @@ use PETScis character(len=*), parameter, public :: & FIELD_MECH_label = 'mechanical' - integer(pInt), parameter :: structOrder = 2_pInt - enum, bind(c) enumerator :: FIELD_UNDEFINED_ID, & FIELD_MECH_ID, & @@ -138,6 +136,7 @@ subroutine utilities_init() IO_timeStamp, & IO_open_file use numerics, only: & + structOrder, & integrationOrder, & worldsize, & worldrank, & diff --git a/src/numerics.f90 b/src/numerics.f90 index f3e9f3e0b..3ee2287c0 100644 --- a/src/numerics.f90 +++ b/src/numerics.f90 @@ -127,12 +127,7 @@ module numerics #ifdef FEM integer(pInt), protected, public :: & integrationOrder = 2_pInt, & !< order of quadrature rule required - structOrder = 2_pInt, & !< order of displacement shape functions - thermalOrder = 2_pInt, & !< order of temperature field shape functions - damageOrder = 2_pInt, & !< order of damage field shape functions - vacancyfluxOrder = 2_pInt, & !< order of vacancy concentration and chemical potential field shape functions - porosityOrder = 2_pInt, & !< order of porosity field shape functions - hydrogenfluxOrder = 2_pInt !< order of hydrogen concentration and chemical potential field shape functions + structOrder = 2_pInt !< order of displacement shape functions logical, protected, public :: & BBarStabilisation = .false. character(len=4096), protected, public :: & @@ -425,16 +420,6 @@ subroutine numerics_init integrationorder = IO_intValue(line,chunkPos,2_pInt) case ('structorder') structorder = IO_intValue(line,chunkPos,2_pInt) - case ('thermalorder') - thermalorder = IO_intValue(line,chunkPos,2_pInt) - case ('damageorder') - damageorder = IO_intValue(line,chunkPos,2_pInt) - case ('vacancyfluxorder') - vacancyfluxOrder = IO_intValue(line,chunkPos,2_pInt) - case ('porosityorder') - porosityOrder = IO_intValue(line,chunkPos,2_pInt) - case ('hydrogenfluxorder') - hydrogenfluxOrder = IO_intValue(line,chunkPos,2_pInt) case ('petsc_options') petsc_options = trim(line(chunkPos(4):)) case ('bbarstabilisation') @@ -587,11 +572,6 @@ subroutine numerics_init #ifdef FEM write(6,'(a24,1x,i8)') ' integrationOrder: ',integrationOrder write(6,'(a24,1x,i8)') ' structOrder: ',structOrder - write(6,'(a24,1x,i8)') ' thermalOrder: ',thermalOrder - write(6,'(a24,1x,i8)') ' damageOrder: ',damageOrder - write(6,'(a24,1x,i8)') ' vacancyfluxOrder: ',vacancyfluxOrder - write(6,'(a24,1x,i8)') ' porosityOrder: ',porosityOrder - write(6,'(a24,1x,i8)') ' hydrogenfluxOrder: ',hydrogenfluxOrder write(6,'(a24,1x,a)') ' PETSc_options: ',trim(petsc_defaultOptions)//' '//trim(petsc_options) write(6,'(a24,1x,L8)') ' B-Bar stabilisation: ',BBarStabilisation #endif