240130.140224.HKT revise algorithm_c.f90

libprima · Jan 30, 2024 · 2bc6eda · 2bc6eda
1 parent 3ab7e3d
commit 2bc6eda
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 20 deletions.
diff --git a/c/bobyqa_c.f90 b/c/bobyqa_c.f90
@@ -171,24 +171,28 @@ subroutine callback_fcn(x_sub, f_sub, nf_sub, tr, cstrv_sub, nlconstr_sub, termi
 use, non_intrinsic :: consts_mod, only : RP, IK
 use, non_intrinsic :: memory_mod, only : safealloc
 implicit none
+
+! Inputs
 real(RP), intent(in) :: x_sub(:) ! We name some variables _sub to avoid masking the parent variables
 real(RP), intent(in) :: f_sub
 integer(IK), intent(in) :: nf_sub
 integer(IK), intent(in) :: tr
 real(RP), intent(in), optional :: cstrv_sub
 real(RP), intent(in), optional :: nlconstr_sub(:)
+
+! Outputs
 logical, intent(out), optional :: terminate
 
 ! Local variables
+integer(C_INT) :: m_nlconstr
 integer(C_INT) :: n_sub_loc
-real(C_DOUBLE) :: x_sub_loc(size(x_sub))
-real(C_DOUBLE) :: f_sub_loc
 integer(C_INT) :: nf_sub_loc
 integer(C_INT) :: tr_loc
+logical(C_BOOL) :: terminate_loc
 real(C_DOUBLE) :: cstrv_sub_loc
-integer(C_INT) :: m_nlconstr
+real(C_DOUBLE) :: f_sub_loc
+real(C_DOUBLE) :: x_sub_loc(size(x_sub))
 real(C_DOUBLE), allocatable :: nlconstr_sub_loc(:)
-logical(C_BOOL) :: terminate_loc
 
 ! Read the inputs and convert them to the types specified in CCALLBACK
 n_sub_loc = size(x_sub)

diff --git a/c/cobyla_c.f90 b/c/cobyla_c.f90
@@ -208,24 +208,28 @@ subroutine callback_fcn(x_sub, f_sub, nf_sub, tr, cstrv_sub, nlconstr_sub, termi
 use, non_intrinsic :: consts_mod, only : RP, IK
 use, non_intrinsic :: memory_mod, only : safealloc
 implicit none
+
+! Inputs
 real(RP), intent(in) :: x_sub(:) ! We name some variables _sub to avoid masking the parent variables
 real(RP), intent(in) :: f_sub
 integer(IK), intent(in) :: nf_sub
 integer(IK), intent(in) :: tr
 real(RP), intent(in), optional :: cstrv_sub
 real(RP), intent(in), optional :: nlconstr_sub(:)
+
+! Outputs
 logical, intent(out), optional :: terminate
 
 ! Local variables
+integer(C_INT) :: m_nlconstr
 integer(C_INT) :: n_sub_loc
-real(C_DOUBLE) :: x_sub_loc(size(x_sub))
-real(C_DOUBLE) :: f_sub_loc
 integer(C_INT) :: nf_sub_loc
 integer(C_INT) :: tr_loc
+logical(C_BOOL) :: terminate_loc
 real(C_DOUBLE) :: cstrv_sub_loc
-integer(C_INT) :: m_nlconstr
+real(C_DOUBLE) :: f_sub_loc
+real(C_DOUBLE) :: x_sub_loc(size(x_sub))
 real(C_DOUBLE), allocatable :: nlconstr_sub_loc(:)
-logical(C_BOOL) :: terminate_loc
 
 ! Read the inputs and convert them to the types specified in CCALLBACK
 n_sub_loc = size(x_sub)

diff --git a/c/lincoa_c.f90 b/c/lincoa_c.f90
@@ -193,24 +193,28 @@ subroutine callback_fcn(x_sub, f_sub, nf_sub, tr, cstrv_sub, nlconstr_sub, termi
 use, non_intrinsic :: consts_mod, only : RP, IK
 use, non_intrinsic :: memory_mod, only : safealloc
 implicit none
+
+! Inputs
 real(RP), intent(in) :: x_sub(:) ! We name some variables _sub to avoid masking the parent variables
 real(RP), intent(in) :: f_sub
 integer(IK), intent(in) :: nf_sub
 integer(IK), intent(in) :: tr
 real(RP), intent(in), optional :: cstrv_sub
 real(RP), intent(in), optional :: nlconstr_sub(:)
+
+! Outputs
 logical, intent(out), optional :: terminate
 
 ! Local variables
+integer(C_INT) :: m_nlconstr
 integer(C_INT) :: n_sub_loc
-real(C_DOUBLE) :: x_sub_loc(size(x_sub))
-real(C_DOUBLE) :: f_sub_loc
 integer(C_INT) :: nf_sub_loc
 integer(C_INT) :: tr_loc
+logical(C_BOOL) :: terminate_loc
 real(C_DOUBLE) :: cstrv_sub_loc
-integer(C_INT) :: m_nlconstr
+real(C_DOUBLE) :: f_sub_loc
+real(C_DOUBLE) :: x_sub_loc(size(x_sub))
 real(C_DOUBLE), allocatable :: nlconstr_sub_loc(:)
-logical(C_BOOL) :: terminate_loc
 
 ! Read the inputs and convert them to the types specified in CCALLBACK
 n_sub_loc = size(x_sub)

diff --git a/c/newuoa_c.f90 b/c/newuoa_c.f90
@@ -150,24 +150,28 @@ subroutine callback_fcn(x_sub, f_sub, nf_sub, tr, cstrv_sub, nlconstr_sub, termi
 use, non_intrinsic :: consts_mod, only : RP, IK
 use, non_intrinsic :: memory_mod, only : safealloc
 implicit none
+
+! Inputs
 real(RP), intent(in) :: x_sub(:) ! We name some variables _sub to avoid masking the parent variables
 real(RP), intent(in) :: f_sub
 integer(IK), intent(in) :: nf_sub
 integer(IK), intent(in) :: tr
 real(RP), intent(in), optional :: cstrv_sub
 real(RP), intent(in), optional :: nlconstr_sub(:)
+
+! Output
 logical, intent(out), optional :: terminate
 
 ! Local variables
+integer(C_INT) :: m_nlconstr
 integer(C_INT) :: n_sub_loc
-real(C_DOUBLE) :: x_sub_loc(size(x_sub))
-real(C_DOUBLE) :: f_sub_loc
 integer(C_INT) :: nf_sub_loc
 integer(C_INT) :: tr_loc
+logical(C_BOOL) :: terminate_loc
 real(C_DOUBLE) :: cstrv_sub_loc
-integer(C_INT) :: m_nlconstr
+real(C_DOUBLE) :: f_sub_loc
+real(C_DOUBLE) :: x_sub_loc(size(x_sub))
 real(C_DOUBLE), allocatable :: nlconstr_sub_loc(:)
-logical(C_BOOL) :: terminate_loc
 
 ! Read the inputs and convert them to the types specified in CCALLBACK
 n_sub_loc = size(x_sub)

diff --git a/c/uobyqa_c.f90 b/c/uobyqa_c.f90
@@ -140,24 +140,28 @@ subroutine callback_fcn(x_sub, f_sub, nf_sub, tr, cstrv_sub, nlconstr_sub, termi
 use, non_intrinsic :: consts_mod, only : RP, IK
 use, non_intrinsic :: memory_mod, only : safealloc
 implicit none
+
+! Inputs
 real(RP), intent(in) :: x_sub(:) ! We name some variables _sub to avoid masking the parent variables
 real(RP), intent(in) :: f_sub
 integer(IK), intent(in) :: nf_sub
 integer(IK), intent(in) :: tr
 real(RP), intent(in), optional :: cstrv_sub
 real(RP), intent(in), optional :: nlconstr_sub(:)
+
+! Outputs
 logical, intent(out), optional :: terminate
 
 ! Local variables
+integer(C_INT) :: m_nlconstr
 integer(C_INT) :: n_sub_loc
-real(C_DOUBLE) :: x_sub_loc(size(x_sub))
-real(C_DOUBLE) :: f_sub_loc
 integer(C_INT) :: nf_sub_loc
 integer(C_INT) :: tr_loc
+logical(C_BOOL) :: terminate_loc
 real(C_DOUBLE) :: cstrv_sub_loc
-integer(C_INT) :: m_nlconstr
+real(C_DOUBLE) :: f_sub_loc
+real(C_DOUBLE) :: x_sub_loc(size(x_sub))
 real(C_DOUBLE), allocatable :: nlconstr_sub_loc(:)
-logical(C_BOOL) :: terminate_loc
 
 ! Read the inputs and convert them to the types specified in CCALLBACK
 n_sub_loc = size(x_sub)