From 65ebbb12de8515af4d72b813b3f8de2946ba26ba Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 07:59:16 +0100 Subject: [PATCH 1/3] fix frozen flag type (int -> bool) --- gitmodules/hdf5 | 2 +- gitmodules/nanobind_json | 2 +- src/aero_particle.F90 | 2 +- src/aero_particle.hpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gitmodules/hdf5 b/gitmodules/hdf5 index bbf1e26c..85d9ec88 160000 --- a/gitmodules/hdf5 +++ b/gitmodules/hdf5 @@ -1 +1 @@ -Subproject commit bbf1e26cda5654fe9e6ea08c57029fa0c1007f53 +Subproject commit 85d9ec8864bee030ac72f65a7656bb55600dc82f diff --git a/gitmodules/nanobind_json b/gitmodules/nanobind_json index cb8a8565..6e9e15fe 160000 --- a/gitmodules/nanobind_json +++ b/gitmodules/nanobind_json @@ -1 +1 @@ -Subproject commit cb8a8565cc3bc7510b448cea6e6ec9cff98a599b +Subproject commit 6e9e15fee7fee798ec3259cb1fa1829c3991b567 diff --git a/src/aero_particle.F90 b/src/aero_particle.F90 index ea00442b..53e85d41 100644 --- a/src/aero_particle.F90 +++ b/src/aero_particle.F90 @@ -528,7 +528,7 @@ subroutine f_aero_particle_frozen( & type(aero_particle_t), pointer :: aero_particle_ptr_f => null() type(c_ptr), intent(in) :: aero_particle_ptr_c - integer(c_int), intent(out) :: is_frozen + logical(c_bool), intent(out) :: is_frozen call c_f_pointer(aero_particle_ptr_c, aero_particle_ptr_f) diff --git a/src/aero_particle.hpp b/src/aero_particle.hpp index 3f7d176f..25df7dd6 100644 --- a/src/aero_particle.hpp +++ b/src/aero_particle.hpp @@ -42,7 +42,7 @@ extern "C" void f_aero_particle_greatest_create_time(const void *aero_particle_p extern "C" void f_aero_particle_least_create_time(const void *aero_particle_ptr, double *val) noexcept; extern "C" void f_aero_particle_get_component_sources(const void *aero_particle_ptr, void *arr_data, const int *arr_size) noexcept; extern "C" void f_aero_particle_id(const void *aero_particle_ptr, int64_t *val) noexcept; -extern "C" void f_aero_particle_frozen(const void *aero_particle_ptr, int *val) noexcept; +extern "C" void f_aero_particle_frozen(const void *aero_particle_ptr, bool *val) noexcept; extern "C" void f_aero_particle_refract_shell(const void *aero_particle_ptr, std::complex *val, const int *arr_size) noexcept; extern "C" void f_aero_particle_refract_core(const void *aero_particle_ptr, std::complex *val, const int *arr_size) noexcept; extern "C" void f_aero_particle_set_weight_class(void *ptr, const int *weight_class) noexcept; @@ -384,7 +384,7 @@ struct AeroParticle { } static auto is_frozen(const AeroParticle &self) { - int val; + bool val; f_aero_particle_frozen( self.ptr.f_arg(), &val From dabe912d001dc8d489d0c9b53c6f1b209eccec95 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 08:00:48 +0100 Subject: [PATCH 2/3] revert unintentional HDF5 bump --- gitmodules/hdf5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitmodules/hdf5 b/gitmodules/hdf5 index 85d9ec88..bbf1e26c 160000 --- a/gitmodules/hdf5 +++ b/gitmodules/hdf5 @@ -1 +1 @@ -Subproject commit 85d9ec8864bee030ac72f65a7656bb55600dc82f +Subproject commit bbf1e26cda5654fe9e6ea08c57029fa0c1007f53 From 2878f81e034671018b94c0f23af1805d8beec3e7 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Wed, 14 Jan 2026 08:01:42 +0100 Subject: [PATCH 3/3] revert unintentional nanobind_json version change --- gitmodules/nanobind_json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitmodules/nanobind_json b/gitmodules/nanobind_json index 6e9e15fe..cb8a8565 160000 --- a/gitmodules/nanobind_json +++ b/gitmodules/nanobind_json @@ -1 +1 @@ -Subproject commit 6e9e15fee7fee798ec3259cb1fa1829c3991b567 +Subproject commit cb8a8565cc3bc7510b448cea6e6ec9cff98a599b