From 9baec1a0ff2a5ce4f94fd4cc7407f80462683209 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Tue, 15 Dec 2015 20:45:54 +0000 Subject: [PATCH] get rid of overly long file names 1/2 --- ...pectral_driver.f90 => DAMASK_spectral.f90} | 2 +- code/DAMASK_spectral_solverAL.f90 | 12 +++---- code/DAMASK_spectral_solverBasicPETSc.f90 | 12 +++---- code/DAMASK_spectral_solverPolarisation.f90 | 12 +++---- code/Makefile | 32 +++++++++---------- code/mesh.f90 | 2 +- code/spectral_damage.f90 | 10 +++--- code/spectral_thermal.f90 | 10 +++--- ...l_utilities.f90 => spectral_utilities.f90} | 6 ++-- 9 files changed, 49 insertions(+), 49 deletions(-) rename code/{DAMASK_spectral_driver.f90 => DAMASK_spectral.f90} (99%) rename code/{DAMASK_spectral_utilities.f90 => spectral_utilities.f90} (99%) diff --git a/code/DAMASK_spectral_driver.f90 b/code/DAMASK_spectral.f90 similarity index 99% rename from code/DAMASK_spectral_driver.f90 rename to code/DAMASK_spectral.f90 index eda262fc2..aefa40f66 100644 --- a/code/DAMASK_spectral_driver.f90 +++ b/code/DAMASK_spectral.f90 @@ -65,7 +65,7 @@ program DAMASK_spectral_Driver damage_type, & THERMAL_conduction_ID, & DAMAGE_nonlocal_ID - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & utilities_init, & utilities_destroy, & tSolutionState, & diff --git a/code/DAMASK_spectral_solverAL.f90 b/code/DAMASK_spectral_solverAL.f90 index 11fc125b6..11485d2d1 100644 --- a/code/DAMASK_spectral_solverAL.f90 +++ b/code/DAMASK_spectral_solverAL.f90 @@ -12,7 +12,7 @@ module DAMASK_spectral_solverAL pReal use math, only: & math_I3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tSolutionState, & tSolutionParams @@ -116,7 +116,7 @@ subroutine AL_init worldsize use DAMASK_interface, only: & getSolverJobName - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_constitutiveResponse, & Utilities_updateGamma, & Utilities_updateIPcoords @@ -259,7 +259,7 @@ type(tSolutionState) function & update_gamma use math, only: & math_invSym3333 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tBoundaryCondition, & Utilities_maskedCompliance, & Utilities_updateGamma @@ -347,7 +347,7 @@ subroutine AL_formResidual(in,x_scal,f_scal,dummy,ierr) math_mul3333xx33, & math_invSym3333, & math_mul33x33 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & wgt, & tensorField_real, & utilities_FFTtensorForward, & @@ -570,7 +570,7 @@ subroutine AL_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC,rotation_ use mesh, only: & grid3, & grid - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_calculateRate, & Utilities_forwardField, & Utilities_updateIPcoords, & @@ -701,7 +701,7 @@ end subroutine AL_forward !> @brief destroy routine !-------------------------------------------------------------------------------------------------- subroutine AL_destroy() - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_destroy implicit none diff --git a/code/DAMASK_spectral_solverBasicPETSc.f90 b/code/DAMASK_spectral_solverBasicPETSc.f90 index 64286ca20..38834c30a 100644 --- a/code/DAMASK_spectral_solverBasicPETSc.f90 +++ b/code/DAMASK_spectral_solverBasicPETSc.f90 @@ -12,7 +12,7 @@ module DAMASK_spectral_SolverBasicPETSc pReal use math, only: & math_I3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tSolutionState, & tSolutionParams @@ -104,7 +104,7 @@ subroutine basicPETSc_init worldsize use DAMASK_interface, only: & getSolverJobName - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_constitutiveResponse, & Utilities_updateGamma, & utilities_updateIPcoords, & @@ -230,7 +230,7 @@ type(tSolutionState) function & IO_error use numerics, only: & update_gamma - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tBoundaryCondition, & Utilities_maskedCompliance, & Utilities_updateGamma @@ -314,7 +314,7 @@ subroutine BasicPETSC_formResidual(in,x_scal,f_scal,dummy,ierr) debug_level, & debug_spectral, & debug_spectralRotation - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tensorField_real, & utilities_FFTtensorForward, & utilities_FFTtensorBackward, & @@ -457,7 +457,7 @@ subroutine BasicPETSc_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC,r use mesh, only: & grid, & grid3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_calculateRate, & Utilities_forwardField, & utilities_updateIPcoords, & @@ -555,7 +555,7 @@ end subroutine BasicPETSc_forward !> @brief destroy routine !-------------------------------------------------------------------------------------------------- subroutine BasicPETSc_destroy() - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_destroy implicit none diff --git a/code/DAMASK_spectral_solverPolarisation.f90 b/code/DAMASK_spectral_solverPolarisation.f90 index 1aa720249..211ccf884 100644 --- a/code/DAMASK_spectral_solverPolarisation.f90 +++ b/code/DAMASK_spectral_solverPolarisation.f90 @@ -12,7 +12,7 @@ module DAMASK_spectral_solverPolarisation pReal use math, only: & math_I3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tSolutionState, & tSolutionParams @@ -116,7 +116,7 @@ subroutine Polarisation_init worldsize use DAMASK_interface, only: & getSolverJobName - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_constitutiveResponse, & Utilities_updateGamma, & Utilities_updateIPcoords @@ -258,7 +258,7 @@ type(tSolutionState) function & update_gamma use math, only: & math_invSym3333 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tBoundaryCondition, & Utilities_maskedCompliance, & Utilities_updateGamma @@ -346,7 +346,7 @@ subroutine Polarisation_formResidual(in,x_scal,f_scal,dummy,ierr) math_mul3333xx33, & math_invSym3333, & math_mul33x33 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & wgt, & tensorField_real, & utilities_FFTtensorForward, & @@ -568,7 +568,7 @@ subroutine Polarisation_forward(guess,timeinc,timeinc_old,loadCaseTime,F_BC,P_BC use mesh, only: & grid3, & grid - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_calculateRate, & Utilities_forwardField, & Utilities_updateIPcoords, & @@ -698,7 +698,7 @@ end subroutine Polarisation_forward !> @brief destroy routine !-------------------------------------------------------------------------------------------------- subroutine Polarisation_destroy() - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & Utilities_destroy implicit none diff --git a/code/Makefile b/code/Makefile index 7f337d0a4..d273f9621 100644 --- a/code/Makefile +++ b/code/Makefile @@ -332,11 +332,11 @@ DAMASK_spectral.exe: COMPILE_MAXOPTI += -DSpectral DAMASK_spectral.exe: MESHNAME := mesh.f90 DAMASK_spectral.exe: INTERFACENAME := DAMASK_spectral_interface.f90 -DAMASK_spectral_driver.o: IGNORE := \# -DAMASK_spectral_driver.o: COMPILE += -DSpectral -DAMASK_spectral_driver.o: COMPILE_MAXOPTI += -DSpectral -DAMASK_spectral_driver.o: MESHNAME := mesh.f90 -DAMASK_spectral_driver.o: INTERFACENAME := DAMASK_spectral_interface.f90 +DAMASK_spectral.o: IGNORE := \# +DAMASK_spectral.o: COMPILE += -DSpectral +DAMASK_spectral.o: COMPILE_MAXOPTI += -DSpectral +DAMASK_spectral.o: MESHNAME := mesh.f90 +DAMASK_spectral.o: INTERFACENAME := DAMASK_spectral_interface.f90 SPECTRAL_SOLVER_FILES = DAMASK_spectral_solverAL.o DAMASK_spectral_solverBasicPETSc.o DAMASK_spectral_solverPolarisation.o \ @@ -349,35 +349,35 @@ SPECTRAL_FILES = prec.o DAMASK_interface.o IO.o libs.o numerics.o debug.o math.o $(THERMAL_FILES) $(DAMAGE_FILES) $(VACANCYFLUX_FILES) $(HYDROGENFLUX_FILES) $(POROSITY_FILES) \ $(HOMOGENIZATION_FILES) homogenization.o \ CPFEM.o \ - DAMASK_spectral_utilities.o \ + spectral_utilities.o \ $(SPECTRAL_SOLVER_FILES) -DAMASK_spectral.exe: DAMASK_spectral_driver.o +DAMASK_spectral.exe: DAMASK_spectral.o $(PREFIX) $(LINKERNAME) $(OPENMP_FLAG_$(F90)) $(LINK_OPTIONS_$(F90)) $(STANDARD_CHECK_$(F90)) $(OPTIMIZATION_$(MAXOPTI)_$(F90)) \ - -o DAMASK_spectral.exe DAMASK_spectral_driver.o \ + -o DAMASK_spectral.exe DAMASK_spectral.o \ $(SPECTRAL_FILES) $(LIBRARIES) $(SUFFIX) -DAMASK_spectral_driver.o: DAMASK_spectral_driver.f90 \ +DAMASK_spectral.o: DAMASK_spectral.f90 \ $(SPECTRAL_SOLVER_FILES) - $(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral_driver.f90 $(SUFFIX) + $(PREFIX) $(COMPILERNAME) $(COMPILE_MAXOPTI) -c DAMASK_spectral.f90 $(SUFFIX) DAMASK_spectral_solverAL.o: DAMASK_spectral_solverAL.f90 \ - DAMASK_spectral_utilities.o + spectral_utilities.o DAMASK_spectral_solverPolarisation.o: DAMASK_spectral_solverPolarisation.f90 \ - DAMASK_spectral_utilities.o + spectral_utilities.o DAMASK_spectral_solverBasicPETSc.o: DAMASK_spectral_solverBasicPETSc.f90 \ - DAMASK_spectral_utilities.o + spectral_utilities.o spectral_thermal.o: spectral_thermal.f90 \ - DAMASK_spectral_utilities.o + spectral_utilities.o spectral_damage.o: spectral_damage.f90 \ - DAMASK_spectral_utilities.o + spectral_utilities.o -DAMASK_spectral_utilities.o: DAMASK_spectral_utilities.f90 \ +spectral_utilities.o: spectral_utilities.f90 \ CPFEM.o ##################### diff --git a/code/mesh.f90 b/code/mesh.f90 index f5af037a0..d8d48a5b6 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -736,7 +736,7 @@ integer(pInt) function mesh_FEasCP(what,myID) mesh_FEasCP = lookupMap(2_pInt,upper) return endif - + ! this might be the reason for the heap problems binarySearch: do while (upper-lower > 1_pInt) center = (lower+upper)/2_pInt if (lookupMap(1_pInt,center) < myID) then diff --git a/code/spectral_damage.f90 b/code/spectral_damage.f90 index 06a0b7f8a..8963ee863 100644 --- a/code/spectral_damage.f90 +++ b/code/spectral_damage.f90 @@ -11,7 +11,7 @@ module spectral_damage pReal use math, only: & math_I3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tSolutionState, & tSolutionParams use numerics, only: & @@ -82,7 +82,7 @@ subroutine spectral_damage_init() IO_intOut, & IO_read_realFile, & IO_timeStamp - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & wgt use mesh, only: & grid, & @@ -179,7 +179,7 @@ type(tSolutionState) function spectral_damage_solution(guess,timeinc,timeinc_old itmax, & err_damage_tolAbs, & err_damage_tolRel - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tBoundaryCondition, & Utilities_maskedCompliance, & Utilities_updateGamma @@ -265,7 +265,7 @@ subroutine spectral_damage_formResidual(in,x_scal,f_scal,dummy,ierr) grid3 use math, only: & math_mul33x3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & scalarField_real, & vectorField_real, & utilities_FFTvectorForward, & @@ -346,7 +346,7 @@ subroutine spectral_damage_forward(guess,timeinc,timeinc_old,loadCaseTime) use mesh, only: & grid, & grid3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & cutBack, & wgt use damage_nonlocal, only: & diff --git a/code/spectral_thermal.f90 b/code/spectral_thermal.f90 index 831df5587..176bb0938 100644 --- a/code/spectral_thermal.f90 +++ b/code/spectral_thermal.f90 @@ -11,7 +11,7 @@ module spectral_thermal pReal use math, only: & math_I3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tSolutionState, & tSolutionParams use numerics, only: & @@ -82,7 +82,7 @@ subroutine spectral_thermal_init IO_intOut, & IO_read_realFile, & IO_timeStamp - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & wgt use mesh, only: & grid, & @@ -181,7 +181,7 @@ type(tSolutionState) function spectral_thermal_solution(guess,timeinc,timeinc_ol itmax, & err_thermal_tolAbs, & err_thermal_tolRel - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & tBoundaryCondition, & Utilities_maskedCompliance, & Utilities_updateGamma @@ -267,7 +267,7 @@ subroutine spectral_thermal_formResidual(in,x_scal,f_scal,dummy,ierr) grid3 use math, only: & math_mul33x3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & scalarField_real, & vectorField_real, & utilities_FFTvectorForward, & @@ -345,7 +345,7 @@ subroutine spectral_thermal_forward(guess,timeinc,timeinc_old,loadCaseTime) use mesh, only: & grid, & grid3 - use DAMASK_spectral_Utilities, only: & + use spectral_utilities, only: & cutBack, & wgt use thermal_conduction, only: & diff --git a/code/DAMASK_spectral_utilities.f90 b/code/spectral_utilities.f90 similarity index 99% rename from code/DAMASK_spectral_utilities.f90 rename to code/spectral_utilities.f90 index f8ec4f19c..8443362ec 100644 --- a/code/DAMASK_spectral_utilities.f90 +++ b/code/spectral_utilities.f90 @@ -6,7 +6,7 @@ !> @author Philip Eisenlohr, Max-Planck-Institut für Eisenforschung GmbH !> @brief Utilities used by the different spectral solver variants !-------------------------------------------------------------------------------------------------- -module DAMASK_spectral_utilities +module spectral_utilities use, intrinsic :: iso_c_binding use prec, only: & pReal, & @@ -223,7 +223,7 @@ subroutine utilities_init() tensorSize = 9_C_INTPTR_T mainProcess: if (worldrank == 0) then - write(6,'(/,a)') ' <<<+- DAMASK_spectral_utilities init -+>>>' + write(6,'(/,a)') ' <<<+- spectral_utilities init -+>>>' write(6,'(a)') ' $Id$' write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" @@ -1290,4 +1290,4 @@ subroutine utilities_destroy() end subroutine utilities_destroy -end module DAMASK_spectral_utilities +end module spectral_utilities