Merge pull request #185 from loganoz/fix/errors

Convert stops in horses into real errors
loganoz · Oct 16, 2023 · 4179468 · 4179468
2 parents b26cd82 + 519f84b
commit 4179468
Show file tree

Hide file tree

Showing 156 changed files with 544 additions and 544 deletions.
diff --git a/Solver/src/CahnHilliardSolver/SpatialDiscretization.f90 b/Solver/src/CahnHilliardSolver/SpatialDiscretization.f90
@@ -70,7 +70,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
          if ( .not. controlVariables % ContainsKey(CHDiscretizationKey) ) then
             print*, "Input file is missing entry for keyword: Cahn-Hilliard discretization"
             errorMessage(STD_OUT)
-            stop
+            error stop
          end if
 
          CHDiscretizationName = controlVariables % stringValueForKey(CHDiscretizationKey, requestedLength = LINE_LENGTH)
@@ -93,7 +93,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
             write(STD_OUT,'(A)') "  * BR2"
             write(STD_OUT,'(A)') "  * IP"
             errorMessage(STD_OUT)
-            stop 
+            error stop 
 
          end select
 
@@ -149,7 +149,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode)
          case default
             print*, "Unrecognized mode"
             errorMessage(STD_OUT)
-            stop
+            error stop
          end select
 !
 !        **************************************
@@ -192,7 +192,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode)
 #ifdef _HAS_MPI_
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !         call mesh % UpdateMPIFacesSolution
 !$omp end single
 #endif
@@ -206,7 +206,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode)
 #ifdef _HAS_MPI_
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !         call mesh % UpdateMPIFacesGradients
 !$omp end single
 #endif
@@ -284,7 +284,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode)
 #ifdef _HAS_MPI_
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !         call mesh % UpdateMPIFacesSolution
 !$omp end single
 #endif
@@ -298,7 +298,7 @@ subroutine ComputeTimeDerivative( mesh, particles, time, mode)
 #ifdef _HAS_MPI_
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !         call mesh % UpdateMPIFacesGradients
 !$omp end single
 #endif
@@ -382,7 +382,7 @@ subroutine ComputeTimeDerivativeIsolated( mesh, particles, time, mode)
          REAL(KIND=RP)                   :: time
          integer,             intent(in) :: mode
 
-         ERROR stop 'ComputeTimeDerivativeIsolated not implemented for Cahn-Hilliard'
+         error stop 'ComputeTimeDerivativeIsolated not implemented for Cahn-Hilliard'
       end subroutine ComputeTimeDerivativeIsolated
 !
 !///////////////////////////////////////////////////////////////////////////////////////////
@@ -432,7 +432,7 @@ subroutine ComputeLaplacian( mesh , t)
             case default
                print*, "Unrecognized face type"
                errorMessage(STD_OUT)
-               stop
+               error stop
 
             end select 
             end associate 
@@ -464,7 +464,7 @@ subroutine ComputeLaplacian( mesh , t)
          if ( MPI_Process % doMPIAction ) then
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !            call mesh % GatherMPIFacesGradients
 !$omp end single
 !
@@ -574,7 +574,7 @@ subroutine ComputeLaplacianNeumannBCs( mesh , t)
          if ( MPI_Process % doMPIAction ) then
 !$omp single
 errorMessage(STD_OUT)
-stop
+error stop
 !            call mesh % GatherMPIFacesGradients
 !$omp end single
 !

diff --git a/Solver/src/CahnHilliardSolver/main.f90 b/Solver/src/CahnHilliardSolver/main.f90
@@ -74,15 +74,15 @@ PROGRAM HORSES3DMainCH
 
       CALL ReadControlFile( controlVariables )
       CALL CheckInputIntegrity(controlVariables, success)
-      IF(.NOT. success)   ERROR STOP "Control file reading error"
+      IF(.NOT. success)   error stop "Control file reading error"
 
 !
 !     ----------------
 !     Set up the DGSEM
 !     ----------------
 !      
       CALL ConstructPhysicsStorage( controlVariables, success )
-      IF(.NOT. success)   ERROR STOP "Physics parameters input error"
+      IF(.NOT. success)   error stop "Physics parameters input error"
 
       call GetMeshPolynomialOrders(controlVariables,Nx,Ny,Nz,Nmax)
       call InitializeNodalStorage (controlVariables,Nmax)
@@ -96,8 +96,8 @@ PROGRAM HORSES3DMainCH
                                  Nx_ = Nx,     Ny_ = Ny,     Nz_ = Nz,                                                 &
                                  success           = success)
 
-      IF(.NOT. success)   ERROR STOP "Mesh reading error"
-      IF(.NOT. success)   ERROR STOP "Boundary condition specification error"
+      IF(.NOT. success)   error stop "Mesh reading error"
+      IF(.NOT. success)   error stop "Boundary condition specification error"
       CALL UserDefinedFinalSetup(sem % mesh, multiphase)
 !
 !     -------------------------
@@ -376,7 +376,7 @@ subroutine CheckIfTheVersionIsRequested
 
             if ( trim(arg) .eq. "--version" ) then
                print*, "Current HORSES version: ", trim(VERSION)
-               stop
+               error stop
             end if
          end do
 

diff --git a/Solver/src/IncompressibleNSSolver/SpatialDiscretization.f90 b/Solver/src/IncompressibleNSSolver/SpatialDiscretization.f90
@@ -101,7 +101,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                write(STD_OUT,'(A)') "  * Standard"
                write(STD_OUT,'(A)') "  * Split-Form"
                errorMessage(STD_OUT)
-               stop 
+               error stop 
 
             end select
 
@@ -112,7 +112,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                if ( .not. controlVariables % ContainsKey(viscousDiscretizationKey) ) then
                   print*, "Input file is missing entry for keyword: viscous discretization"
                   errorMessage(STD_OUT)
-                  stop
+                  error stop
                end if
 
                viscousDiscretizationName = controlVariables % stringValueForKey(viscousDiscretizationKey, requestedLength = LINE_LENGTH)
@@ -135,7 +135,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                   write(STD_OUT,'(A)') "  * BR2"
                   write(STD_OUT,'(A)') "  * IP"
                   errorMessage(STD_OUT)
-                  stop 
+                  error stop 
 
                end select
 
@@ -570,7 +570,7 @@ subroutine TimeDerivative_StrongVolumetricContribution( e , t )
             e % storage % QDot = ScalarStrongIntegrals % StdVolumeGreen ( e , NCONS, contravariantFlux ) 
 
          type is (SplitDG_t)
-            ERROR stop ':: TimeDerivative_StrongVolumetricContribution not implemented for split form'
+            error stop ':: TimeDerivative_StrongVolumetricContribution not implemented for split form'
 !~ !
 !~ !           Compute sharp fluxes for skew-symmetric approximations
 !~ !           ------------------------------------------------------

diff --git a/Solver/src/IncompressibleNSSolver/main.f90 b/Solver/src/IncompressibleNSSolver/main.f90
@@ -73,15 +73,15 @@ PROGRAM HORSES3DMainiNS
 
       CALL ReadControlFile( controlVariables )
       CALL CheckInputIntegrity(controlVariables, success)
-      IF(.NOT. success)   ERROR STOP "Control file reading error"
+      IF(.NOT. success)   error stop "Control file reading error"
 
 !
 !     ----------------
 !     Set up the DGSEM
 !     ----------------
 !      
       CALL ConstructPhysicsStorage( controlVariables, success )
-      IF(.NOT. success)   ERROR STOP "Physics parameters input error"
+      IF(.NOT. success)   error stop "Physics parameters input error"
 
       ! Initialize manufactured solutions if necessary
 
@@ -95,8 +95,8 @@ PROGRAM HORSES3DMainiNS
 
       call Initialize_SpaceAndTimeMethods(controlVariables, sem % mesh)
 
-      IF(.NOT. success)   ERROR STOP "Mesh reading error"
-      IF(.NOT. success)   ERROR STOP "Boundary condition specification error"
+      IF(.NOT. success)   error stop "Mesh reading error"
+      IF(.NOT. success)   error stop "Boundary condition specification error"
       CALL UserDefinedFinalSetup(sem % mesh, thermodynamics, dimensionless, refValues)
 !
 !     -------------------------
@@ -376,7 +376,7 @@ subroutine CheckIfTheVersionIsRequested
 
             if ( trim(arg) .eq. "--version" ) then
                print*, "Current HORSES version: ", trim(VERSION)
-               stop
+               error stop
             end if
          end do
 

diff --git a/Solver/src/MultiphaseSolver/SpatialDiscretization.f90 b/Solver/src/MultiphaseSolver/SpatialDiscretization.f90
@@ -100,13 +100,13 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
             case ( "split-form")
                print*, "There are no split-forms available for the Multiphase Solver"
                errorMessage(STD_OUT)
-               stop
+               error stop
             case default
                write(STD_OUT,'(A,A,A)') 'Requested inviscid discretization "',trim(inviscidDiscretizationName),'" is not implemented.'
                write(STD_OUT,'(A)') "Implemented discretizations are:"
                write(STD_OUT,'(A)') "  * Standard"
                errorMessage(STD_OUT)
-               stop 
+               error stop 
 
             end select
 
@@ -117,7 +117,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                if ( .not. controlVariables % ContainsKey(viscousDiscretizationKey) ) then
                   print*, "Input file is missing entry for keyword: viscous discretization"
                   errorMessage(STD_OUT)
-                  stop
+                  error stop
                end if
 
                viscousDiscretizationName = controlVariables % stringValueForKey(viscousDiscretizationKey, requestedLength = LINE_LENGTH)
@@ -140,7 +140,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                   write(STD_OUT,'(A)') "  * BR2"
                   write(STD_OUT,'(A)') "  * IP"
                   errorMessage(STD_OUT)
-                  stop 
+                  error stop 
 
                end select
 
@@ -157,7 +157,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
             if ( .not. controlVariables % ContainsKey(CHDiscretizationKey) ) then
                print*, "Input file is missing entry for keyword: Cahn-Hilliard discretization"
                errorMessage(STD_OUT)
-               stop
+               error stop
             end if
 
             CHDiscretizationName = controlVariables % stringValueForKey(CHDiscretizationKey, requestedLength = LINE_LENGTH)
@@ -180,7 +180,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, mesh)
                write(STD_OUT,'(A)') "  * BR2"
                write(STD_OUT,'(A)') "  * IP"
                errorMessage(STD_OUT)
-               stop 
+               error stop 
 
             end select
 
@@ -1136,7 +1136,7 @@ subroutine ComputeLaplacian( mesh , t)
             case default
                print*, "Unrecognized face type"
                errorMessage(STD_OUT)
-               stop
+               error stop
 
             end select 
             end associate 

diff --git a/Solver/src/MultiphaseSolver/main.f90 b/Solver/src/MultiphaseSolver/main.f90
@@ -73,15 +73,15 @@ PROGRAM HORSES3DMainMU
 
       CALL ReadControlFile( controlVariables )
       CALL CheckInputIntegrity(controlVariables, success)
-      IF(.NOT. success)   ERROR STOP "Control file reading error"
+      IF(.NOT. success)   error stop "Control file reading error"
 
 !
 !     ----------------
 !     Set up the DGSEM
 !     ----------------
 !      
       CALL ConstructPhysicsStorage( controlVariables, success )
-      IF(.NOT. success)   ERROR STOP "Physics parameters input error"
+      IF(.NOT. success)   error stop "Physics parameters input error"
 
       ! Initialize manufactured solutions if necessary
 
@@ -95,8 +95,8 @@ PROGRAM HORSES3DMainMU
 
       call Initialize_SpaceAndTimeMethods(controlVariables, sem % mesh)
 
-      IF(.NOT. success)   ERROR STOP "Mesh reading error"
-      IF(.NOT. success)   ERROR STOP "Boundary condition specification error"
+      IF(.NOT. success)   error stop "Mesh reading error"
+      IF(.NOT. success)   error stop "Boundary condition specification error"
       CALL UserDefinedFinalSetup(sem % mesh, thermodynamics, dimensionless, refValues, multiphase)
 !
 !     -------------------------
@@ -376,7 +376,7 @@ subroutine CheckIfTheVersionIsRequested
 
             if ( trim(arg) .eq. "--version" ) then
                print*, "Current HORSES version: ", trim(VERSION)
-               stop
+               error stop
             end if
          end do
 

diff --git a/Solver/src/NavierStokesSolver/SpatialDiscretization.f90 b/Solver/src/NavierStokesSolver/SpatialDiscretization.f90
@@ -95,7 +95,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
                write(STD_OUT,'(A)') "  * Standard"
                write(STD_OUT,'(A)') "  * Split-Form"
                errorMessage(STD_OUT)
-               stop
+               error stop
 
             end select
 
@@ -134,7 +134,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
                      write(STD_OUT,'(A)') "  * Entropy"
                      write(STD_OUT,'(A)') "  * Energy"
                      errorMessage(STD_OUT)
-                     stop
+                     error stop
                   end select
 
                else
@@ -151,7 +151,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
                if ( .not. controlVariables % ContainsKey(viscousDiscretizationKey) ) then
                   print*, "Input file is missing entry for keyword: viscous discretization"
                   errorMessage(STD_OUT)
-                  stop
+                  error stop
                end if
 
                viscousDiscretizationName = controlVariables % stringValueForKey(viscousDiscretizationKey, requestedLength = LINE_LENGTH)
@@ -174,7 +174,7 @@ subroutine Initialize_SpaceAndTimeMethods(controlVariables, sem)
                   write(STD_OUT,'(A)') "  * BR2"
                   write(STD_OUT,'(A)') "  * IP"
                   errorMessage(STD_OUT)
-                  stop
+                  error stop
 
                end select
 

diff --git a/Solver/src/NavierStokesSolver/main.f90 b/Solver/src/NavierStokesSolver/main.f90
@@ -75,15 +75,15 @@ PROGRAM HORSES3DMainNS
 
       CALL ReadControlFile( controlVariables )
       CALL CheckInputIntegrity(controlVariables, success)
-      IF(.NOT. success)   ERROR STOP "Control file reading error"
+      IF(.NOT. success)   error stop "Control file reading error"
 
 !
 !     ----------------
 !     Set up the DGSEM
 !     ----------------
 !
       CALL ConstructPhysicsStorage( controlVariables, success )
-      IF(.NOT. success)   ERROR STOP "Physics parameters input error"
+      IF(.NOT. success)   error stop "Physics parameters input error"
 
       ! Initialize manufactured solutions if necessary
       sem % ManufacturedSol = controlVariables % containsKey("manufactured solution")
@@ -102,8 +102,8 @@ PROGRAM HORSES3DMainNS
 
       call Initialize_SpaceAndTimeMethods(controlVariables, sem)
 
-      IF(.NOT. success)   ERROR STOP "Mesh reading error"
-      IF(.NOT. success)   ERROR STOP "Boundary condition specification error"
+      IF(.NOT. success)   error stop "Mesh reading error"
+      IF(.NOT. success)   error stop "Boundary condition specification error"
       CALL UserDefinedFinalSetup(sem % mesh, thermodynamics, dimensionless, refValues)
 !
 !     -------------------------
@@ -392,7 +392,7 @@ subroutine CheckIfTheVersionIsRequested
 
             if ( trim(arg) .eq. "--version" ) then
                print*, "Current HORSES version: ", trim(VERSION)
-               stop
+               error stop
             end if
          end do