Fixed some io messages and fail conditions

MintonGroup · Jul 7, 2021 · ac3f372 · ac3f372
1 parent 006401b
commit ac3f372
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/src/io/io.f90 b/src/io/io.f90
@@ -264,20 +264,17 @@ module subroutine io_param_reader(self, unit, iotype, v_list, iostat, iomsg)
          end if
       else
          if (self%lfragmentation) then
-            write(iomsg,*) 'This integrator does not support fragmentation.'
-            iostat = -1
-            return
+            write(iomsg,*) 'This integrator does not support fragmentation. This parameter will be ignored.'
          end if
          if (mtiny_set) then
-            write(iomsg,*) 'This integrator does not support MTINY'
-            iostat = -1
+            write(iomsg,*) 'This integrator does not support MTINY. This parameter will be ignored.'
             return
          end if
       end if
 
       if ((integrator == SYMBA) .or. (integrator == RINGMOONS) .or. (integrator == RMVS)) then
          if (.not.self%lclose) then
-            write(iomsg,*) 'This integrator requires CHK_CLOSE to be enabled'
+            write(iomsg,*) 'This integrator requires CHK_CLOSE to be enabled.'
             iostat = -1
             return
          end if
@@ -295,11 +292,10 @@ module subroutine io_param_reader(self, unit, iotype, v_list, iostat, iomsg)
 
       ! Determine if the GR flag is set correctly for this integrator
       select case(integrator)
-      case(WHM)
+      case(WHM, RMVS)
          write(*,*) "GR             = ", self%lgr
       case default   
-         write(iomsg, *) 'GR is implemented compatible with this integrator'
-         iostat = -1
+         write(iomsg, *) 'GR is implemented compatible with this integrator. This parameter will be ignored.'
       end select
 
       iostat = 0

diff --git a/src/setup/setup.f90 b/src/setup/setup.f90
@@ -15,7 +15,6 @@ module subroutine setup_construct_system(system, param)
       case (BS)
          write(*,*) 'Bulirsch-Stoer integrator not yet enabled'
       case (HELIO)
-         write(*,*) 'Democratic Heliocentric integrator not yet enabled'
          allocate(helio_nbody_system :: system)
          select type(system)
          class is (helio_nbody_system)