From 8516873d2b0abdc52d682b66c193386161284bdd Mon Sep 17 00:00:00 2001 From: David A Minton Date: Wed, 21 Dec 2022 14:47:00 -0500 Subject: [PATCH] Made some changes to file i/o. Code runs again. --- src/collision/collision_io.f90 | 2 ++ src/encounter/encounter_io.f90 | 2 ++ src/swiftest/swiftest_io.f90 | 6 ++++-- src/swiftest/swiftest_setup.f90 | 2 ++ 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/collision/collision_io.f90 b/src/collision/collision_io.f90 index 5a7ead8c0..22de3f27c 100644 --- a/src/collision/collision_io.f90 +++ b/src/collision/collision_io.f90 @@ -87,6 +87,8 @@ module subroutine collision_netcdf_io_initialize_output(self, param) self%out_type = NF90_FLOAT case("NETCDF_DOUBLE") self%out_type = NF90_DOUBLE + case default + write(*,*) trim(adjustl(param%out_type)), " is an invalid OUT_TYPE" end select ! Check if the file exists, and if it does, delete it diff --git a/src/encounter/encounter_io.f90 b/src/encounter/encounter_io.f90 index 46851cf2c..c5b68b98c 100644 --- a/src/encounter/encounter_io.f90 +++ b/src/encounter/encounter_io.f90 @@ -82,6 +82,8 @@ module subroutine encounter_netcdf_io_initialize_output(self, param) self%out_type = NF90_FLOAT case("NETCDF_DOUBLE") self%out_type = NF90_DOUBLE + case default + write(*,*) trim(adjustl(param%out_type)), " is an invalid OUT_TYPE" end select ! Check if the file exists, and if it does, delete it diff --git a/src/swiftest/swiftest_io.f90 b/src/swiftest/swiftest_io.f90 index a3fa11e11..efaf45d1f 100644 --- a/src/swiftest/swiftest_io.f90 +++ b/src/swiftest/swiftest_io.f90 @@ -599,10 +599,12 @@ module subroutine swiftest_io_netcdf_initialize_output(self, param) sfill = ieee_value(sfill, IEEE_QUIET_NAN) select case (param%out_type) - case("netcdf_io_FLOAT") + case("NETCDF_FLOAT") nc%out_type = NF90_FLOAT - case("netcdf_io_DOUBLE") + case("NETCDF_DOUBLE") nc%out_type = NF90_DOUBLE + case default + write(*,*) trim(adjustl(param%out_type)), " is an invalid OUT_TYPE" end select ! Check if the file exists, and if it does, delete it diff --git a/src/swiftest/swiftest_setup.f90 b/src/swiftest/swiftest_setup.f90 index 2e6ff3851..bbeafc6d2 100644 --- a/src/swiftest/swiftest_setup.f90 +++ b/src/swiftest/swiftest_setup.f90 @@ -113,6 +113,8 @@ module subroutine swiftest_setup_construct_system(system, param) write(*,*) 'Unkown integrator',param%integrator call util_exit(FAILURE) end select + + allocate(swiftest_particle_info :: system%cb%info) end select return