From 694724027b4dca3ce0b21b69f9a3666ab39fc78e Mon Sep 17 00:00:00 2001 From: David A Minton Date: Mon, 9 Jan 2023 18:24:53 -0500 Subject: [PATCH] Got rid of the consistency check for nplm. It's easier just to recompute it --- src/swiftest/swiftest_io.f90 | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90 index f288f9107..7e25b316f 100644 --- a/src/swiftest/swiftest_io.f90 +++ b/src/swiftest/swiftest_io.f90 @@ -945,7 +945,7 @@ module function swiftest_io_netcdf_read_frame_system(self, nc, param) result(ier ! Return integer(I4B) :: ierr !! Error code: returns 0 if the read is successful ! Internals - integer(I4B) :: i, idmax, npl_check, ntp_check, nplm_check, str_max, status, npl, ntp + integer(I4B) :: i, idmax, npl_check, ntp_check, str_max, status, npl, ntp real(DP), dimension(:), allocatable :: rtemp real(DP), dimension(:,:), allocatable :: vectemp integer(I4B), dimension(:), allocatable :: itemp @@ -999,7 +999,6 @@ module function swiftest_io_netcdf_read_frame_system(self, nc, param) result(ier if (npl_check /= npl) then write(*,*) "Error reading in NetCDF file: The recorded value of npl does not match the number of active massive bodies" - call base_util_exit(failure) end if if (ntp_check /= ntp) then @@ -1007,13 +1006,7 @@ module function swiftest_io_netcdf_read_frame_system(self, nc, param) result(ier call base_util_exit(failure) end if - if (param%lmtiny_pl) then - nplm_check = count(pack(rtemp,plmask) > param%GMTINY ) - if (nplm_check /= pl%nplm) then - write(*,*) "Error reading in NetCDF file: The recorded value of nplm does not match the number of active fully interacting massive bodies" - call base_util_exit(failure) - end if - end if + if (param%lmtiny_pl) pl%nplm = count(pack(rtemp,plmask) > param%GMTINY ) ! Now read in each variable and split the outputs by body type if ((param%in_form == "XV") .or. (param%in_form == "XVEL")) then