From 5f462729c7e4d82e4adbb34e6206e1a8dcf8ab86 Mon Sep 17 00:00:00 2001 From: Martin Diehl Date: Wed, 3 Apr 2019 21:42:30 +0000 Subject: [PATCH] was .or., i.e. should be max not min --- src/grid_damage_spectral.f90 | 2 +- src/grid_thermal_spectral.f90 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/grid_damage_spectral.f90 b/src/grid_damage_spectral.f90 index 2019664e2..c5e9a254b 100644 --- a/src/grid_damage_spectral.f90 +++ b/src/grid_damage_spectral.f90 @@ -199,7 +199,7 @@ function grid_damage_spectral_solution(timeinc,timeinc_old,loadCaseTime) result( call MPI_Allreduce(MPI_IN_PLACE,stagNorm,1,MPI_DOUBLE,MPI_MAX,PETSC_COMM_WORLD,ierr) call MPI_Allreduce(MPI_IN_PLACE,solnNorm,1,MPI_DOUBLE,MPI_MAX,PETSC_COMM_WORLD,ierr) damage_stagInc = damage_current - solution%stagConverged = stagNorm < min(err_damage_tolAbs, err_damage_tolRel*solnNorm) + solution%stagConverged = stagNorm < max(err_damage_tolAbs, err_damage_tolRel*solnNorm) !-------------------------------------------------------------------------------------------------- ! updating damage state diff --git a/src/grid_thermal_spectral.f90 b/src/grid_thermal_spectral.f90 index adaf0d429..31740feb9 100644 --- a/src/grid_thermal_spectral.f90 +++ b/src/grid_thermal_spectral.f90 @@ -202,7 +202,7 @@ function grid_thermal_spectral_solution(timeinc,timeinc_old,loadCaseTime) result call MPI_Allreduce(MPI_IN_PLACE,stagNorm,1,MPI_DOUBLE,MPI_MAX,PETSC_COMM_WORLD,ierr) call MPI_Allreduce(MPI_IN_PLACE,solnNorm,1,MPI_DOUBLE,MPI_MAX,PETSC_COMM_WORLD,ierr) temperature_stagInc = temperature_current - solution%stagConverged = stagNorm < min(err_thermal_tolAbs, err_thermal_tolRel*solnNorm) + solution%stagConverged = stagNorm < max(err_thermal_tolAbs, err_thermal_tolRel*solnNorm) !-------------------------------------------------------------------------------------------------- ! updating thermal state