Skip to content

Fix Fortran Wrapper Parameter Passing Bug in barrier and forget Functions #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kellih wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix Fortran Wrapper Parameter Passing Bug in barrier and forget Functions #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a01d34
add MPI check in FORTRAN_WRAPPER in CMakeLists.txt
Apr 3, 2026
acc2feb
removed value labels on barrier and forget calls.
Apr 3, 2026
f7d9b27
update unit tests to include barrier and forget calls.
Apr 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,13 @@ endif(C_WRAPPER)
if(FORTRAN_WRAPPER)
message("-- MUI Fortran wrapper: Selected")

find_package(MPI REQUIRED)
if(MPI_FOUND)
include_directories(SYSTEM ${MPI_INCLUDE_PATH})
elseif(NOT MPI_FOUND)
message(SEND_ERROR "MPI not found")
endif(MPI_FOUND)

check_language(Fortran)
if(CMAKE_Fortran_COMPILER)
enable_language(Fortran)
Expand Down
4 changes: 1 addition & 3 deletions src/mui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
//Include temporal samplers
#include "samplers/temporal/temporal_sampler_exact.h"
#include "samplers/temporal/temporal_sampler_gauss.h"
#include "samplers/temporal/temporal_sampler_gauss_adaptive.h"
Copy link
Copy Markdown
Member

@Wendi-L Wendi-L Jun 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think temporal_sampler_gauss_adaptive is a part of the code base. Suggest removing this include

#include "samplers/temporal/temporal_sampler_mean.h"
#include "samplers/temporal/temporal_sampler_sum.h"
#include "samplers/temporal/temporal_sampler_linear.h"
Copy link
Copy Markdown
Member

@Wendi-L Wendi-L Jun 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this include. temporal_sampler_linear has now been merged and is required.


//Include coupling algorithms
#include "samplers/algorithm/algo_fixed_relaxation.h"
Expand Down Expand Up @@ -120,7 +120,6 @@ namespace mui {
DECLARE_SAMPLER_0ARG(temporal_sampler_gauss,SUFFIX,config_##SUFFIX);\
DECLARE_SAMPLER_0ARG(temporal_sampler_sum,SUFFIX,config_##SUFFIX);\
DECLARE_SAMPLER_0ARG(temporal_sampler_mean,SUFFIX,config_##SUFFIX);\
DECLARE_SAMPLER_0ARG(temporal_sampler_linear,SUFFIX,config_##SUFFIX);\
Copy link
Copy Markdown
Member

@Wendi-L Wendi-L Jun 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this declaration. temporal_sampler_linear is now part of the main codebase.

DECLARE_SAMPLER_0ARG(algo_fixed_relaxation,SUFFIX,config_##SUFFIX);\
DECLARE_SAMPLER_0ARG(algo_aitken,SUFFIX,config_##SUFFIX);\
namespace geometry {\
Expand Down Expand Up @@ -162,7 +161,6 @@ SPECIALIZE(3fx,float,int64_t,3);
DECLARE_SAMPLER_0ARG(temporal_sampler_gauss,SUFFIX,CONFIG);\
DECLARE_SAMPLER_0ARG(temporal_sampler_sum,SUFFIX,CONFIG);\
DECLARE_SAMPLER_0ARG(temporal_sampler_mean,SUFFIX,CONFIG);\
DECLARE_SAMPLER_0ARG(temporal_sampler_linear,SUFFIX,CONFIG);\
Copy link
Copy Markdown
Member

@Wendi-L Wendi-L Jun 1, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep this declaration. temporal_sampler_linear is now part of the main codebase.

DECLARE_SAMPLER_0ARG(algo_fixed_relaxation,SUFFIX,CONFIG);\
DECLARE_SAMPLER_0ARG(algo_aitken,SUFFIX,CONFIG);\
}
Expand Down
100 changes: 50 additions & 50 deletions wrappers/Fortran/mui_f_wrapper_1d.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13865,62 +13865,62 @@ end subroutine mui_announce_recv_disable_1t_f
subroutine mui_barrier_1f_f(uniface,t) bind(C)
import :: c_ptr,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: t
real(kind=c_float), intent(in) :: t
end subroutine mui_barrier_1f_f

subroutine mui_barrier_1fx_f(uniface,t) bind(C)
import :: c_ptr,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: t
real(kind=c_float), intent(in) :: t
end subroutine mui_barrier_1fx_f

subroutine mui_barrier_1d_f(uniface,t) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t
real(kind=c_double), intent(in) :: t
end subroutine mui_barrier_1d_f

subroutine mui_barrier_1dx_f(uniface,t) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t
real(kind=c_double), intent(in) :: t
end subroutine mui_barrier_1dx_f

subroutine mui_barrier_1t_f(uniface,t) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t
real(kind=c_double), intent(in) :: t
end subroutine mui_barrier_1t_f

!Barrier at two time values
subroutine mui_barrier_1f_pair_f(uniface,t,it) bind(C)
import :: c_ptr,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: t,it
real(kind=c_float), intent(in) :: t,it
end subroutine mui_barrier_1f_pair_f

subroutine mui_barrier_1fx_pair_f(uniface,t,it) bind(C)
import :: c_ptr,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: t,it
real(kind=c_float), intent(in) :: t,it
end subroutine mui_barrier_1fx_pair_f

subroutine mui_barrier_1d_pair_f(uniface,t,it) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t,it
real(kind=c_double), intent(in) :: t,it
end subroutine mui_barrier_1d_pair_f

subroutine mui_barrier_1dx_pair_f(uniface,t,it) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t,it
real(kind=c_double), intent(in) :: t,it
end subroutine mui_barrier_1dx_pair_f

subroutine mui_barrier_1t_pair_f(uniface,t,it) bind(C)
import :: c_ptr,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: t,it
real(kind=c_double), intent(in) :: t,it
end subroutine mui_barrier_1t_pair_f

!******************************************
Expand All @@ -13931,144 +13931,144 @@ end subroutine mui_barrier_1t_pair_f
subroutine mui_forget_upper_1f_f(uniface,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1f_f

subroutine mui_forget_upper_1fx_f(uniface,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1fx_f

subroutine mui_forget_upper_1d_f(uniface,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1d_f

subroutine mui_forget_upper_1dx_f(uniface,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1dx_f

subroutine mui_forget_upper_1t_f(uniface,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1t_f

!Forget log between [-inf, -inf], [upper_1, upper_2]
subroutine mui_forget_upper_1f_pair_f(uniface,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1f_pair_f

subroutine mui_forget_upper_1fx_pair_f(uniface,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1fx_pair_f

subroutine mui_forget_upper_1d_pair_f(uniface,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1d_pair_f

subroutine mui_forget_upper_1dx_pair_f(uniface,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1dx_pair_f

subroutine mui_forget_upper_1t_pair_f(uniface,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_upper_1t_pair_f

!Forget log between [lower, upper]
subroutine mui_forget_lower_upper_1f_f(uniface,lower,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: lower,upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: lower,upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1f_f

subroutine mui_forget_lower_upper_1fx_f(uniface,lower,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: lower,upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: lower,upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1fx_f

subroutine mui_forget_lower_upper_1d_f(uniface,lower,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower,upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower,upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1d_f

subroutine mui_forget_lower_upper_1dx_f(uniface,lower,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower,upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower,upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1dx_f

subroutine mui_forget_lower_upper_1t_f(uniface,lower,upper,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower,upper
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower,upper
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1t_f

!Forget log between [lower_1, lower_2], [upper_1, upper_2]
subroutine mui_forget_lower_upper_1f_pair_f(uniface,lower_1,lower_2,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1f_pair_f

subroutine mui_forget_lower_upper_1fx_pair_f(uniface,lower_1,lower_2,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_float
type(c_ptr), intent(in), value :: uniface
real(kind=c_float), intent(in), value :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_float), intent(in) :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1fx_pair_f

subroutine mui_forget_lower_upper_1d_pair_f(uniface,lower_1,lower_2,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1d_pair_f

subroutine mui_forget_lower_upper_1dx_pair_f(uniface,lower_1,lower_2,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1dx_pair_f

subroutine mui_forget_lower_upper_1t_pair_f(uniface,lower_1,lower_2,upper_1,upper_2,reset_log) bind(C)
import :: c_ptr,c_int,c_double
type(c_ptr), intent(in), value :: uniface
real(kind=c_double), intent(in), value :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in), value :: reset_log
real(kind=c_double), intent(in) :: lower_1,lower_2,upper_1,upper_2
integer(kind=c_int), intent(in) :: reset_log
end subroutine mui_forget_lower_upper_1t_pair_f

!Set to forget log between [-inf, current-length] automatically
Expand Down
Loading