diff --git a/elmerice/Solvers/GroundedSolver.F90 b/elmerice/Solvers/GroundedSolver.F90 index 14cae29e12..5ff0d7a52d 100644 --- a/elmerice/Solvers/GroundedSolver.F90 +++ b/elmerice/Solvers/GroundedSolver.F90 @@ -80,7 +80,7 @@ SUBROUTINE GroundedSolver( Model,Solver,dt,TransientSimulation ) TYPE(Nodes_t), SAVE :: Nodes LOGICAL :: AllocationsDone = .FALSE., GotIt, stat,UnFoundFatal=.TRUE.,& - AllGrounded = .FALSE., useLSvar = .FALSE., Active + AllGrounded = .FALSE., useLSvar = .FALSE. INTEGER :: i, mn, n, t, Nn, istat, DIM, MSum, ZSum, bedrockSource INTEGER, POINTER :: Permutation(:), bedrockPerm(:), LSvarPerm(:) @@ -103,8 +103,6 @@ SUBROUTINE GroundedSolver( Model,Solver,dt,TransientSimulation ) Permutation => PointerToVariable % Perm VariableValues => PointerToVariable % Values - Active = ANY(Permutation > 0) - CALL INFO(SolverName, 'Computing grounded mask from geometry', level=3) !-------------------------------------------------------------- @@ -282,7 +280,7 @@ SUBROUTINE GroundedSolver( Model,Solver,dt,TransientSimulation ) END IF END DO - IF ( ParEnv % PEs>1 .AND. Active) CALL ParallelSumVector( Solver % Matrix, VariableValues, 1 ) + IF ( ParEnv % PEs>1 ) CALL ParallelSumVector( Solver % Matrix, VariableValues, 1 ) CALL INFO( SolverName , 'Done') diff --git a/elmerice/UserFunctions/USF_Contact.F90 b/elmerice/UserFunctions/USF_Contact.F90 index 94781f83a4..f7db22220a 100644 --- a/elmerice/UserFunctions/USF_Contact.F90 +++ b/elmerice/UserFunctions/USF_Contact.F90 @@ -269,14 +269,14 @@ FUNCTION SlidCoef_Contact ( Model, nodenumber, y) RESULT(Bdrag) IF (thresh.LE.0.0_dp) THEN GroundedMask(Nn) = -1.0_dp GL_retreat = GL_retreat + 1 - PRINT *, 'Retreat of the Grounding Line : ' - PRINT *, Nodes % x(ii), Nodes % y(ii), Nodes % z(ii) + WRITE(Message,*)'Retreat of the Grounding Line : ', Nodes % x(ii), Nodes % y(ii) + CALL INFO(USF_Name, Message, Level=4) ELSE IF ( Distance(DistancePerm(Element % NodeIndexes(ii))).LE.thresh ) THEN GroundedMask(Nn) = -1.0_dp GL_retreat = GL_retreat + 1 - PRINT *, 'Retreat of the Grounding Line : ' - PRINT *, Nodes % x(ii), Nodes % y(ii), Nodes % z(ii) + WRITE(message,*)'Retreat of the Grounding Line : ', Nodes % x(ii), Nodes % y(ii) + CALL INFO(USF_Name, Message, Level=4) END IF END IF END IF