Merge branch 'debug' into IntelAdvisor

MintonGroup · Oct 21, 2021 · 79f32e8 · 79f32e8
2 parents e4168b9 + ef402a5
commit 79f32e8
Show file tree

Hide file tree

Showing 4 changed files with 205 additions and 183 deletions.
diff --git a/src/io/io.f90 b/src/io/io.f90
@@ -201,7 +201,7 @@ module subroutine io_dump_particle_info_base(self, param, idx)
 
          close(unit = LUN, err = 667, iomsg = errmsg)
       else if ((param%out_type == NETCDF_FLOAT_TYPE) .or. (param%out_type == NETCDF_DOUBLE_TYPE)) then
-         call self%write_particle_info(param%nciu)
+         call self%write_particle_info(param%nciu, param)
       end if
 
       return
@@ -1932,7 +1932,7 @@ module subroutine io_write_discard(self, param)
 
          ! Record the discarded body metadata information to file
          if ((param%out_type == NETCDF_FLOAT_TYPE) .or. (param%out_type == NETCDF_DOUBLE_TYPE)) then
-            call tp_discards%write_particle_info(param%nciu)
+            call tp_discards%write_particle_info(param%nciu, param)
          end if
 
          if (param%discard_out == "") return

diff --git a/src/modules/swiftest_classes.f90 b/src/modules/swiftest_classes.f90
@@ -1008,10 +1008,11 @@ module subroutine netcdf_read_hdr_system(self, iu, param)
          class(swiftest_parameters),   intent(inout) :: param !! Current run configuration parameters
       end subroutine netcdf_read_hdr_system
 
-      module subroutine netcdf_read_particle_info_system(self, iu, plmask, tpmask)
+      module subroutine netcdf_read_particle_info_system(self, iu, param, plmask, tpmask)
          implicit none
          class(swiftest_nbody_system), intent(inout) :: self   !! Swiftest nbody system object
          class(netcdf_parameters),     intent(inout) :: iu     !! Parameters used to identify a particular NetCDF dataset
+         class(swiftest_parameters),   intent(inout) :: param  !! Current run configuration parameters
          logical, dimension(:),        intent(in)    :: plmask !! Logical array indicating which index values belong to massive bodies
          logical, dimension(:),        intent(in)    :: tpmask !! Logical array indicating which index values belong to test particles
       end subroutine netcdf_read_particle_info_system
@@ -1020,27 +1021,28 @@ module subroutine netcdf_write_frame_base(self, iu, param)
          implicit none
          class(swiftest_base),       intent(in)    :: self  !! Swiftest base object
          class(netcdf_parameters),   intent(inout) :: iu    !! Parameters used to for writing a NetCDF dataset to file
-         class(swiftest_parameters), intent(in)    :: param !! Current run configuration parameters 
+         class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters 
       end subroutine netcdf_write_frame_base
 
       module subroutine netcdf_write_frame_system(self, iu, param)
          implicit none
          class(swiftest_nbody_system),  intent(inout) :: self  !! Swiftest system object
          class(netcdf_parameters),      intent(inout) :: iu    !! Parameters used to for writing a NetCDF dataset to file
-         class(swiftest_parameters),    intent(in)    :: param !! Current run configuration parameters 
+         class(swiftest_parameters),    intent(inout) :: param !! Current run configuration parameters 
       end subroutine netcdf_write_frame_system
 
       module subroutine netcdf_write_hdr_system(self, iu, param) 
          implicit none
          class(swiftest_nbody_system), intent(in)    :: self  !! Swiftest nbody system object
          class(netcdf_parameters),     intent(inout) :: iu    !! Parameters used to for writing a NetCDF dataset to file
-         class(swiftest_parameters),   intent(in)    :: param !! Current run configuration parameters
+         class(swiftest_parameters),   intent(inout) :: param !! Current run configuration parameters
       end subroutine netcdf_write_hdr_system
 
-      module subroutine netcdf_write_particle_info_base(self, iu)
+      module subroutine netcdf_write_particle_info_base(self, iu, param)
          implicit none
          class(swiftest_base),       intent(in)    :: self   !! Swiftest particle object
          class(netcdf_parameters),   intent(inout) :: iu     !! Parameters used to identify a particular NetCDF dataset
+         class(swiftest_parameters), intent(inout) :: param !! Current run configuration parameters
       end subroutine netcdf_write_particle_info_base
 
       module subroutine obl_acc_body(self, system)