From ddff0035b6380a49b0519a39828b85187a6b72ed Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 29 Jun 2016 16:59:22 +0200 Subject: [PATCH] removed old regridding related stuff --- code/DAMASK_spectral.f90 | 29 +++++++++++++---------------- code/FEsolving.f90 | 10 ++-------- code/IO.f90 | 2 -- code/mesh.f90 | 6 ++---- 4 files changed, 17 insertions(+), 30 deletions(-) diff --git a/code/DAMASK_spectral.f90 b/code/DAMASK_spectral.f90 index 53c9c4423..706aa22d9 100644 --- a/code/DAMASK_spectral.f90 +++ b/code/DAMASK_spectral.f90 @@ -617,12 +617,12 @@ program DAMASK_spectral timeinc = timeinc/2.0_pReal elseif (solres(1)%termIll) then ! material point model cannot find a solution, exit in any casy call IO_warning(850_pInt) - call quit(-1_pInt*(lastRestartWritten+1_pInt)) ! quit and provide information about last restart inc written (e.g. for regridding) + call quit(-1_pInt*(lastRestartWritten+1_pInt)) ! quit and provide information about last restart inc written elseif (continueCalculation == 1_pInt) then guess = .true. ! accept non converged BVP solution else ! default behavior, exit if spectral solver does not converge call IO_warning(850_pInt) - call quit(-1_pInt*(lastRestartWritten+1_pInt)) ! quit and provide information about last restart inc written (e.g. for regridding) + call quit(-1_pInt*(lastRestartWritten+1_pInt)) ! quit and provide information about last restart inc written endif else guess = .true. ! start guessing after first converged (sub)inc @@ -722,7 +722,7 @@ end program DAMASK_spectral !> @brief quit subroutine to mimic behavior of FEM solvers !> @details exits the Spectral solver and reports time and duration. Exit code 0 signals !> everything went fine. Exit code 1 signals an error, message according to IO_error. Exit code -!> 2 signals request for regridding, increment of last saved restart information is written to +!> 2 signals no converged solution and increment of last saved restart information is written to !> stderr. Exit code 3 signals no severe problems, but some increments did not converge !-------------------------------------------------------------------------------------------------- subroutine quit(stop_id) @@ -735,21 +735,18 @@ subroutine quit(stop_id) integer(pInt), intent(in) :: stop_id integer, dimension(8) :: dateAndTime ! type default integer - if (worldrank == 0_pInt) then - call date_and_time(values = dateAndTime) - write(6,'(/,a)') 'DAMASK terminated on:' - write(6,'(a,2(i2.2,a),i4.4)') 'Date: ',dateAndTime(3),'/',& - dateAndTime(2),'/',& - dateAndTime(1) - write(6,'(a,2(i2.2,a),i2.2)') 'Time: ',dateAndTime(5),':',& - dateAndTime(6),':',& - dateAndTime(7) - endif + call date_and_time(values = dateAndTime) + write(6,'(/,a)') 'DAMASK terminated on:' + write(6,'(a,2(i2.2,a),i4.4)') 'Date: ',dateAndTime(3),'/',& + dateAndTime(2),'/',& + dateAndTime(1) + write(6,'(a,2(i2.2,a),i2.2)') 'Time: ',dateAndTime(5),':',& + dateAndTime(6),':',& + dateAndTime(7) if (stop_id == 0_pInt) stop 0 ! normal termination - if (stop_id < 0_pInt) then ! trigger regridding - if (worldrank == 0_pInt) & - write(0,'(a,i6)') 'restart information available at ', stop_id*(-1_pInt) + if (stop_id < 0_pInt) then ! terminally ill, restart might help + write(0,'(a,i6)') 'restart information available at ', stop_id*(-1_pInt) stop 2 endif if (stop_id == 3_pInt) stop 3 ! not all incs converged diff --git a/code/FEsolving.f90 b/code/FEsolving.f90 index 3b0aeb194..bc7588ff0 100644 --- a/code/FEsolving.f90 +++ b/code/FEsolving.f90 @@ -72,11 +72,9 @@ subroutine FE_init integer(pInt), allocatable, dimension(:) :: chunkPos #endif - mainProcess: if (worldrank == 0) then - write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' <<<+- FEsolving init -+>>>' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" - endif mainProcess modelName = getSolverJobName() #ifdef Spectral @@ -153,10 +151,6 @@ subroutine FE_init 200 close(FILEUNIT) endif -!-------------------------------------------------------------------------------------------------- -! the following array are allocated by mesh.f90 and need to be deallocated in case of regridding - if (allocated(calcMode)) deallocate(calcMode) - if (allocated(FEsolving_execIP)) deallocate(FEsolving_execIP) #endif if (iand(debug_level(debug_FEsolving),debug_levelBasic) /= 0_pInt) then write(6,'(a21,l1)') ' restart writing: ', restartWrite diff --git a/code/IO.f90 b/code/IO.f90 index 2a13ce3d8..55a75b78d 100644 --- a/code/IO.f90 +++ b/code/IO.f90 @@ -1640,8 +1640,6 @@ subroutine IO_error(error_ID,el,ip,g,ext_msg) msg = 'update of gamma operator not possible when pre-calculated' case (880_pInt) msg = 'mismatch of microstructure count and a*b*c in geom file' - case (890_pInt) - msg = 'invalid input for regridding' case (891_pInt) msg = 'unknown solver type selected' case (892_pInt) diff --git a/code/mesh.f90 b/code/mesh.f90 index 5b999cdb4..0562ab218 100644 --- a/code/mesh.f90 +++ b/code/mesh.f90 @@ -514,11 +514,9 @@ subroutine mesh_init(ip,el) integer(pInt) :: j logical :: myDebug - mainProcess: if (worldrank == 0) then - write(6,'(/,a)') ' <<<+- mesh init -+>>>' - write(6,'(a15,a)') ' Current time: ',IO_timeStamp() + write(6,'(/,a)') ' <<<+- mesh init -+>>>' + write(6,'(a15,a)') ' Current time: ',IO_timeStamp() #include "compilation_info.f90" - endif mainProcess if (allocated(mesh_mapFEtoCPelem)) deallocate(mesh_mapFEtoCPelem) if (allocated(mesh_mapFEtoCPnode)) deallocate(mesh_mapFEtoCPnode)