240304.000751.HKT revise fortran examples

libprima · Mar 3, 2024 · 949502e · 949502e
1 parent 1e0559a
commit 949502e
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 41 deletions.
diff --git a/fortran/examples/.gitignore b/fortran/examples/.gitignore
@@ -1,3 +1,5 @@
+*.mod
+*.mod0
 9test
 atest
 dtest

diff --git a/fortran/examples/bobyqa/Makefile b/fortran/examples/bobyqa/Makefile
@@ -23,7 +23,7 @@ SOLVER := $(shell basename $(CURDIR))
 FS ?= 18  # Set FS if it does not have a value.
 FSTD := 20$(FS)
 # Default options for all the compilers.
-FFLAGS := -O3 -g
+FFLAGS := -O -g
 # Common directories.
 COMMON := ../../common
 # Headers.

diff --git a/fortran/examples/bobyqa/bobyqa_example_1.f90 b/fortran/examples/bobyqa/bobyqa_example_1.f90
@@ -61,7 +61,7 @@ program bobyqa_exmp
 use bobyqa_mod, only : bobyqa
 
 ! The following line specifies which module provides CALFUN and CALLBACK_FCN.
-use calfun_mod, only : RP, calfun, callback_fcn
+use calfun_mod, only : RP, IK, calfun, callback_fcn
 
 implicit none
 
@@ -85,7 +85,6 @@ program bobyqa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call bobyqa(calfun, x, f, lb, ub, rhobeg=1.0D-1, iprint=1, nf=nf, info=info, callback_fcn=callback_fcn)
-
+call bobyqa(calfun, x, f, lb, ub, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info, callback_fcn=callback_fcn)
 
 end program bobyqa_exmp
diff --git a/fortran/examples/bobyqa/bobyqa_example_2.f90 b/fortran/examples/bobyqa/bobyqa_example_2.f90
@@ -5,7 +5,7 @@
 !
 ! Started: July 2020
 !
-! Last Modified: Wednesday, January 10, 2024 AM12:21:59
+! Last Modified: Sunday, March 03, 2024 PM11:45:53
 !--------------------------------------------------------------------------------------------------!
 
 
@@ -14,8 +14,9 @@ module calfun_mod
 
 implicit none
 private
-public :: RP, calfun
+public :: RP, IK, calfun
 integer, parameter :: RP = kind(0.0D0)
+integer, parameter :: IK = kind(0)
 
 contains
 
@@ -57,7 +58,7 @@ program bobyqa_exmp
 use bobyqa_mod, only : bobyqa
 
 ! The following line specifies which module provides CALFUN.
-use calfun_mod, only : RP, calfun
+use calfun_mod, only : RP, IK, calfun
 
 implicit none
 
@@ -82,7 +83,6 @@ program bobyqa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call bobyqa(calfun, x, f, lb, ub, rhobeg=1.0D-1, iprint=1, nf=nf, info=info)
-
+call bobyqa(calfun, x, f, lb, ub, rhobeg=0.1_RP, iprint=1_IK, nf=nf, info=info)
 
 end program bobyqa_exmp
diff --git a/fortran/examples/cobyla/Makefile b/fortran/examples/cobyla/Makefile
@@ -23,7 +23,7 @@ SOLVER := $(shell basename $(CURDIR))
 FS ?= 18  # Set FS if it does not have a value.
 FSTD := 20$(FS)
 # Default options for all the compilers.
-FFLAGS := -O3 -g
+FFLAGS := -O -g
 # Common directories.
 COMMON := ../../common
 # Headers.

diff --git a/fortran/examples/cobyla/cobyla_example_1.f90 b/fortran/examples/cobyla/cobyla_example_1.f90
@@ -84,7 +84,6 @@ program cobyla_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call cobyla(calcfc, 1_IK, x, f, cstrv, rhobeg=1.0D-1, iprint=1, nf=nf, info=info, callback_fcn=callback_fcn)
-
+call cobyla(calcfc, 1_IK, x, f, cstrv, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info, callback_fcn=callback_fcn)
 
 end program cobyla_exmp
diff --git a/fortran/examples/cobyla/cobyla_example_2.f90 b/fortran/examples/cobyla/cobyla_example_2.f90
@@ -5,7 +5,7 @@
 !
 ! Started: July 2020
 !
-! Last Modified: Wednesday, September 27, 2023 PM03:12:49
+! Last Modified: Sunday, March 03, 2024 PM11:46:06
 !--------------------------------------------------------------------------------------------------!
 
 
@@ -14,8 +14,9 @@ module calcfc_mod
 
 implicit none
 private
-public :: RP, calcfc_chebyquad, calcfc_hexagon
+public :: RP, IK, calcfc_chebyquad, calcfc_hexagon
 integer, parameter :: RP = kind(0.0D0)
+integer, parameter :: IK = kind(0)
 
 contains
 
@@ -88,7 +89,7 @@ program cobyla_exmp
 use cobyla_mod, only : cobyla
 
 ! The following line specifies which module provides CALCFC.
-use calcfc_mod, only : RP, calcfc_chebyquad, calcfc_hexagon
+use calcfc_mod, only : RP, IK, calcfc_chebyquad, calcfc_hexagon
 
 implicit none
 
@@ -109,7 +110,7 @@ program cobyla_exmp
 ! and IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x_chebyquad = [(real(i, RP) / real(n_chebyquad + 1, RP), i=1, n_chebyquad)] ! Starting point
-call cobyla(calcfc_chebyquad, m, x_chebyquad, f, cstrv, rhobeg=0.2_RP * x_chebyquad(1), iprint=1, nf=nf, info=info)
+call cobyla(calcfc_chebyquad, m, x_chebyquad, f, cstrv, rhobeg=0.2_RP * x_chebyquad(1), iprint=1_IK, nf=nf, info=info)
 
 ! The following lines illustrates how to call the solver to solve the Hexagon problem.
 x_hexagon = 2.0_RP  ! Starting point.
@@ -122,7 +123,7 @@ program cobyla_exmp
 ! the value of CONSTR(X_HEXAGON) when the solver returns.
 x_hexagon = 2.0_RP  ! Starting point.
 allocate (constr(m))
-call cobyla(calcfc_hexagon, m, x_hexagon, f, cstrv, nlconstr=constr, rhobeg=1.0_RP, iprint=1, nf=nf, info=info)
+call cobyla(calcfc_hexagon, m, x_hexagon, f, cstrv, nlconstr=constr, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info)
 deallocate (constr) ! Deallocate the array CONSTR, which is allocated by the solver. Otherwise, memory leaks.
 
 end program cobyla_exmp
diff --git a/fortran/examples/lincoa/Makefile b/fortran/examples/lincoa/Makefile
@@ -23,7 +23,7 @@ SOLVER := $(shell basename $(CURDIR))
 FS ?= 18  # Set FS if it does not have a value.
 FSTD := 20$(FS)
 # Default options for all the compilers.
-FFLAGS := -O3 -g
+FFLAGS := -O -g
 # Common directories.
 COMMON := ../../common
 # Headers.

diff --git a/fortran/examples/lincoa/lincoa_example_1.f90 b/fortran/examples/lincoa/lincoa_example_1.f90
@@ -60,7 +60,7 @@ program lincoa_exmp
 use lincoa_mod, only : lincoa
 
 ! The following line specifies which module provides CALFUN and CALLBACK_FCN.
-use calfun_mod, only : RP, calfun, callback_fcn
+use calfun_mod, only : RP, IK, calfun, callback_fcn
 
 implicit none
 
@@ -84,7 +84,6 @@ program lincoa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call lincoa(calfun, x, f, cstrv, Aineq, bineq, rhobeg=1.0_RP, iprint=1, nf=nf, info=info, callback_fcn=callback_fcn)
-
+call lincoa(calfun, x, f, cstrv, Aineq, bineq, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info, callback_fcn=callback_fcn)
 
 end program lincoa_exmp
diff --git a/fortran/examples/lincoa/lincoa_example_2.f90 b/fortran/examples/lincoa/lincoa_example_2.f90
@@ -5,7 +5,7 @@
 !
 ! Started: July 2020
 !
-! Last Modified: Monday, July 03, 2023 PM02:47:06
+! Last Modified: Sunday, March 03, 2024 PM11:48:23
 !--------------------------------------------------------------------------------------------------!
 
 
@@ -14,8 +14,9 @@ module tetrahedron_mod
 
 implicit none
 private
-public :: RP, calfun, setup
+public :: RP, IK, calfun, setup
 integer, parameter :: RP = kind(0.0D0)
+integer, parameter :: IK = kind(0)
 
 contains
 
@@ -117,7 +118,7 @@ program lincoa_exmp
 use lincoa_mod, only : lincoa
 
 ! The following line specifies which module provides CALFUN.
-use tetrahedron_mod, only : RP, calfun, setup
+use tetrahedron_mod, only : RP, IK, calfun, setup
 
 implicit none
 
@@ -136,6 +137,6 @@ program lincoa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call lincoa(calfun, x, f, cstrv, Aineq, bineq, rhobeg=1.0_RP, iprint=1, nf=nf, info=info)
+call lincoa(calfun, x, f, cstrv, Aineq, bineq, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info)
 
 end program lincoa_exmp
diff --git a/fortran/examples/newuoa/Makefile b/fortran/examples/newuoa/Makefile
@@ -23,7 +23,7 @@ SOLVER := $(shell basename $(CURDIR))
 FS ?= 18  # Set FS if it does not have a value.
 FSTD := 20$(FS)
 # Default options for all the compilers.
-FFLAGS := -O3 -g
+FFLAGS := -O -g
 # Common directories.
 COMMON := ../../common
 # Headers.

diff --git a/fortran/examples/newuoa/newuoa_example_1.f90 b/fortran/examples/newuoa/newuoa_example_1.f90
@@ -61,7 +61,7 @@ program newuoa_exmp
 use newuoa_mod, only : newuoa
 
 ! The following line specifies which module provides CALFUN.
-use calfun_mod, only : RP, calfun, callback_fcn
+use calfun_mod, only : RP, IK, calfun, callback_fcn
 
 implicit none
 
@@ -80,7 +80,6 @@ program newuoa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call newuoa(calfun, x, f, rhobeg=1.0D-1, iprint=1, nf=nf, info=info, callback_fcn=callback_fcn)
-
+call newuoa(calfun, x, f, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info, callback_fcn=callback_fcn)
 
 end program newuoa_exmp
diff --git a/fortran/examples/newuoa/newuoa_example_2.f90 b/fortran/examples/newuoa/newuoa_example_2.f90
@@ -5,7 +5,7 @@
 !
 ! Started: July 2020
 !
-! Last Modified: Tuesday, May 30, 2023 PM06:30:04
+! Last Modified: Sunday, March 03, 2024 PM11:49:07
 !--------------------------------------------------------------------------------------------------!
 
 
@@ -14,8 +14,9 @@ module calfun_mod
 
 implicit none
 private
-public :: RP, calfun
+public :: RP, IK, calfun
 integer, parameter :: RP = kind(0.0D0)
+integer, parameter :: IK = kind(0)
 
 contains
 
@@ -57,7 +58,7 @@ program newuoa_exmp
 use newuoa_mod, only : newuoa
 
 ! The following line specifies which module provides CALFUN.
-use calfun_mod, only : RP, calfun
+use calfun_mod, only : RP, IK, calfun
 
 implicit none
 
@@ -73,6 +74,6 @@ program newuoa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = [(real(i, RP) / real(n + 1, RP), i=1, n)]  ! Define the starting point.
-call newuoa(calfun, x, f, rhobeg=0.2_RP * x(1), iprint=1, nf=nf, info=info)
+call newuoa(calfun, x, f, rhobeg=0.2_RP * x(1), iprint=1_IK, nf=nf, info=info)
 
 end program newuoa_exmp
diff --git a/fortran/examples/uobyqa/Makefile b/fortran/examples/uobyqa/Makefile
@@ -23,7 +23,7 @@ SOLVER := $(shell basename $(CURDIR))
 FS ?= 18  # Set FS if it does not have a value.
 FSTD := 20$(FS)
 # Default options for all the compilers.
-FFLAGS := -O3 -g
+FFLAGS := -O -g
 # Common directories.
 COMMON := ../../common
 # Headers.

diff --git a/fortran/examples/uobyqa/uobyqa_example_1.f90 b/fortran/examples/uobyqa/uobyqa_example_1.f90
@@ -61,7 +61,7 @@ program uobyqa_exmp
 use uobyqa_mod, only : uobyqa
 
 ! The following line specifies which module provides CALFUN and CALLBACK_FCN.
-use calfun_mod, only : RP, calfun, callback_fcn
+use calfun_mod, only : RP, IK, calfun, callback_fcn
 
 implicit none
 
@@ -80,7 +80,6 @@ program uobyqa_exmp
 ! IPRINT, which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will
 ! take their default values coded in the solver.
 x = x0
-call uobyqa(calfun, x, f, rhobeg=1.0D-1, iprint=1, nf=nf, info=info, callback_fcn=callback_fcn)
-
+call uobyqa(calfun, x, f, rhobeg=1.0_RP, iprint=1_IK, nf=nf, info=info, callback_fcn=callback_fcn)
 
 end program uobyqa_exmp
diff --git a/fortran/examples/uobyqa/uobyqa_example_2.f90 b/fortran/examples/uobyqa/uobyqa_example_2.f90
@@ -5,7 +5,7 @@
 !
 ! Started: July 2020
 !
-! Last Modified: Tuesday, May 30, 2023 PM06:33:27
+! Last Modified: Sunday, March 03, 2024 PM11:50:17
 !--------------------------------------------------------------------------------------------------!
 
 
@@ -14,8 +14,9 @@ module calfun_mod
 
 implicit none
 private
-public :: RP, calfun
+public :: RP, IK, calfun
 integer, parameter :: RP = kind(0.0D0)
+integer, parameter :: IK = kind(0)
 
 contains
 
@@ -57,7 +58,7 @@ program uobyqa_exmp
 use uobyqa_mod, only : uobyqa
 
 ! The following line specifies which module provides CALFUN.
-use calfun_mod, only : RP, calfun
+use calfun_mod, only : RP, IK, calfun
 
 implicit none
 
@@ -73,6 +74,6 @@ program uobyqa_exmp
 ! which are optional. All the unspecified optional arguments (RHOEND, MAXFUN, etc.) will take their
 ! default values coded in the solver.
 x = [(real(i, RP) / real(n + 1, RP), i=1, n)]  ! Starting point
-call uobyqa(calfun, x, f, rhobeg=0.2_RP * x(1), iprint=1, nf=nf, info=info)
+call uobyqa(calfun, x, f, rhobeg=0.2_RP * x(1), iprint=1_IK, nf=nf, info=info)
 
 end program uobyqa_exmp