From 21a36b5a7dcacdbe886ef5eb1d96c5352316c544 Mon Sep 17 00:00:00 2001
From: Martin Diehl <m.diehl@mpie.de>
Date: Sat, 4 May 2019 17:47:52 +0200
Subject: [PATCH] errors better visible

---
 src/DAMASK_interface.f90 | 16 ++++++++--------
 src/quit.f90             | 14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/DAMASK_interface.f90 b/src/DAMASK_interface.f90
index a3996c417..ebe625ef6 100644
--- a/src/DAMASK_interface.f90
+++ b/src/DAMASK_interface.f90
@@ -130,7 +130,7 @@ subroutine DAMASK_interface_init
   call MPI_Init_Thread(MPI_THREAD_FUNNELED,threadLevel,mpi_err)
   if (mpi_err /= 0) call quit(1)
   if (threadLevel<MPI_THREAD_FUNNELED) then
-    write(6,'(a)') ' MPI library does not support OpenMP'
+    write(6,'(/,a)') ' ERROR: MPI library does not support OpenMP'
     call quit(1)
   endif
 #endif
@@ -144,11 +144,11 @@ subroutine DAMASK_interface_init
 
   mainProcess: if (worldrank == 0) then
     if (output_unit /= 6) then
-      write(output_unit,'(a)') ' STDOUT != 6'
+      write(output_unit,'(/,a)') ' ERROR: STDOUT != 6'
       call quit(1)
     endif
     if (error_unit /= 0) then
-      write(output_unit,'(a)') ' STDERR != 0'
+      write(output_unit,'(/,a)') ' ERROR: STDERR != 0'
       call quit(1)
     endif
   else mainProcess
@@ -254,14 +254,14 @@ subroutine DAMASK_interface_init
         call get_command_argument(i+1,arg)
         read(arg,*,iostat=stat) interface_restartInc
         if (interface_restartInc < 0 .or. stat /=0) then
-          write(6,'(a)') ' Could not parse restart increment: '//trim(arg)
+          write(6,'(/,a)') ' ERROR: Could not parse restart increment: '//trim(arg)
           call quit(1)
         endif
     end select
   enddo
 
   if (len_trim(loadcaseArg) == 0 .or. len_trim(geometryArg) == 0) then
-    write(6,'(a)') ' Please specify geometry AND load case (-h for help)'
+    write(6,'(/,a)') ' ERROR: Please specify geometry AND load case (-h for help)'
     call quit(1)
   endif
 
@@ -324,7 +324,7 @@ subroutine setWorkingDirectory(workingDirectoryArg)
   workingDirectory = trim(rectifyPath(workingDirectory))
   error = setCWD(trim(workingDirectory))
   if(error) then
-    write(6,'(a20,a,a16)') ' Working directory "',trim(workingDirectory),'" does not exist'
+    write(6,'(/,a)') ' ERROR: Working directory "'//trim(workingDirectory)//'" does not exist'
     call quit(1)
   endif
 
@@ -374,7 +374,7 @@ character(len=1024) function getGeometryFile(geometryParameter)
 
   inquire(file=trim(getGeometryFile), exist=file_exists)
   if (.not. file_exists) then
-    write(6,'(a)') ' Geometry file does not exists ('//trim(getGeometryFile)//')'
+    write(6,'(/,a)') ' ERROR: Geometry file does not exists ('//trim(getGeometryFile)//')'
     call quit(1)
   endif
 
@@ -399,7 +399,7 @@ character(len=1024) function getLoadCaseFile(loadCaseParameter)
 
   inquire(file=trim(getLoadCaseFile), exist=file_exists)
   if (.not. file_exists) then
-    write(6,'(a)') ' Load case file does not exists ('//trim(getLoadCaseFile)//')'
+    write(6,'(/,a)') ' ERROR: Load case file does not exists ('//trim(getLoadCaseFile)//')'
     call quit(1)
   endif
 
diff --git a/src/quit.f90 b/src/quit.f90
index 0215737e5..63184c113 100644
--- a/src/quit.f90
+++ b/src/quit.f90
@@ -34,13 +34,13 @@ subroutine quit(stop_id)
 #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)
+ 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 .and. ierr == 0 .and. error == 0) stop 0                                          ! normal termination
  if (stop_id == 2 .and. ierr == 0 .and. error == 0) stop 2                                          ! not all incs converged