From 4913bd0211c4a0de3007400844cf48040c510b66 Mon Sep 17 00:00:00 2001 From: Alexis Montoison Date: Fri, 18 Jul 2025 09:14:04 -0500 Subject: [PATCH] Use PROTECTED for hsl_available --- hsl_subset/hsl_kb22/hsl_kb22l.f90 | 2 +- hsl_subset/hsl_ma48/hsl_ma48r.f90 | 2 +- hsl_subset/hsl_ma54/hsl_ma54r.f90 | 2 +- hsl_subset/hsl_ma57/hsl_ma57r.f90 | 2 +- hsl_subset/hsl_ma64/hsl_ma64r.f90 | 2 +- hsl_subset/hsl_ma77/hsl_ma77r.f90 | 2 +- hsl_subset/hsl_ma86/hsl_ma86r.f90 | 2 +- hsl_subset/hsl_ma87/hsl_ma87r.f90 | 2 +- hsl_subset/hsl_ma97/hsl_ma97r.f90 | 2 +- hsl_subset/hsl_mc34/hsl_mc34r.f90 | 2 +- hsl_subset/hsl_mc64/hsl_mc64r.f90 | 2 +- hsl_subset/hsl_mc69/hsl_mc69r.f90 | 2 +- hsl_subset/hsl_mc80/hsl_mc80r.f90 | 2 +- hsl_subset/hsl_mi20/hsl_mi20r.f90 | 2 +- hsl_subset/hsl_mi28/hsl_mi28r.f90 | 2 +- hsl_subset/hsl_mi35/hsl_mi35r.f90 | 2 +- hsl_subset/hsl_of01/hsl_of01r.f90 | 2 +- hsl_subset/hsl_zb01/hsl_zb01r.f90 | 2 +- hsl_subset/meson.build | 2 +- libhsl/meson.build | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/hsl_subset/hsl_kb22/hsl_kb22l.f90 b/hsl_subset/hsl_kb22/hsl_kb22l.f90 index 2548675..0fe9b08 100644 --- a/hsl_subset/hsl_kb22/hsl_kb22l.f90 +++ b/hsl_subset/hsl_kb22/hsl_kb22l.f90 @@ -5,7 +5,7 @@ MODULE hsl_kb22_long_integer PRIVATE PUBLIC :: KB22_build_heap, KB22_get_smallest - LOGICAL, PUBLIC :: kb22_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: kb22_available = .FALSE. CONTAINS SUBROUTINE KB22_build_heap( ) END SUBROUTINE KB22_build_heap diff --git a/hsl_subset/hsl_ma48/hsl_ma48r.f90 b/hsl_subset/hsl_ma48/hsl_ma48r.f90 index bc0957d..ea9f4bf 100644 --- a/hsl_subset/hsl_ma48/hsl_ma48r.f90 +++ b/hsl_subset/hsl_ma48/hsl_ma48r.f90 @@ -16,7 +16,7 @@ module hsl_ma48_real ma48_initialize,ma48_analyse,ma48_factorize,ma48_solve, & ma48_finalize, ma48_get_perm,ma48_special_rows_and_cols, & ma48_determinant - LOGICAL, PUBLIC :: ma48_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma48_available = .FALSE. interface ma48_initialize module procedure ma48_initialize_real diff --git a/hsl_subset/hsl_ma54/hsl_ma54r.f90 b/hsl_subset/hsl_ma54/hsl_ma54r.f90 index d7793f1..9e22d29 100644 --- a/hsl_subset/hsl_ma54/hsl_ma54r.f90 +++ b/hsl_subset/hsl_ma54/hsl_ma54r.f90 @@ -3,7 +3,7 @@ #include "hsl_subset.h" MODULE hsl_ma54_real - LOGICAL, PUBLIC :: ma54_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma54_available = .FALSE. CONTAINS SUBROUTINE ma54r( ) END SUBROUTINE ma54r diff --git a/hsl_subset/hsl_ma57/hsl_ma57r.f90 b/hsl_subset/hsl_ma57/hsl_ma57r.f90 index 9f3f0a3..153cd7d 100644 --- a/hsl_subset/hsl_ma57/hsl_ma57r.f90 +++ b/hsl_subset/hsl_ma57/hsl_ma57r.f90 @@ -11,7 +11,7 @@ module hsl_ma57_real implicit none private :: ip_, rp_ - LOGICAL, PUBLIC :: ma57_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma57_available = .FALSE. type ma57_factors private diff --git a/hsl_subset/hsl_ma64/hsl_ma64r.f90 b/hsl_subset/hsl_ma64/hsl_ma64r.f90 index 739acdc..fe539bc 100644 --- a/hsl_subset/hsl_ma64/hsl_ma64r.f90 +++ b/hsl_subset/hsl_ma64/hsl_ma64r.f90 @@ -3,7 +3,7 @@ #include "hsl_subset.h" MODULE hsl_ma64_real - LOGICAL, PUBLIC :: ma64_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma64_available = .FALSE. CONTAINS SUBROUTINE ma64r( ) END SUBROUTINE ma64r diff --git a/hsl_subset/hsl_ma77/hsl_ma77r.f90 b/hsl_subset/hsl_ma77/hsl_ma77r.f90 index 3827977..3c9f034 100644 --- a/hsl_subset/hsl_ma77/hsl_ma77r.f90 +++ b/hsl_subset/hsl_ma77/hsl_ma77r.f90 @@ -14,7 +14,7 @@ module hsl_ma77_real implicit none private :: ip_, long_, lp_, rp_ - LOGICAL, PUBLIC :: ma77_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma77_available = .FALSE. real (rp_), parameter, private :: one = 1.0_rp_ real (rp_), parameter, private :: zero = 0.0_rp_ diff --git a/hsl_subset/hsl_ma86/hsl_ma86r.f90 b/hsl_subset/hsl_ma86/hsl_ma86r.f90 index 00a9cd9..8e8cabb 100644 --- a/hsl_subset/hsl_ma86/hsl_ma86r.f90 +++ b/hsl_subset/hsl_ma86/hsl_ma86r.f90 @@ -17,7 +17,7 @@ module hsl_ma86_real public :: ma86_analyse, ma86_factor, ma86_factor_solve, ma86_solve, & ma86_finalise public :: ma86_get_n__ - LOGICAL, PUBLIC :: ma86_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma86_available = .FALSE. private :: ip_, long_, lp_, rp_ ! Numerical constants diff --git a/hsl_subset/hsl_ma87/hsl_ma87r.f90 b/hsl_subset/hsl_ma87/hsl_ma87r.f90 index cee846e..9b1f8a9 100644 --- a/hsl_subset/hsl_ma87/hsl_ma87r.f90 +++ b/hsl_subset/hsl_ma87/hsl_ma87r.f90 @@ -17,7 +17,7 @@ module hsl_ma87_real public :: ma87_analyse, ma87_factor, ma87_factor_solve, ma87_solve, & ma87_sparse_fwd_solve, ma87_finalise public :: ma87_get_n__ - LOGICAL, PUBLIC :: ma87_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma87_available = .FALSE. private :: ip_, long_, lp_, rp_ ! Parameters (all private) diff --git a/hsl_subset/hsl_ma97/hsl_ma97r.f90 b/hsl_subset/hsl_ma97/hsl_ma97r.f90 index b847fdc..a70d673 100644 --- a/hsl_subset/hsl_ma97/hsl_ma97r.f90 +++ b/hsl_subset/hsl_ma97/hsl_ma97r.f90 @@ -16,7 +16,7 @@ module hsl_ma97_real ma97_enquire_posdef, ma97_enquire_indef, ma97_alter, & ma97_lmultiply, ma97_sparse_fwd_solve public :: ma97_get_n__, ma97_get_nz__ - LOGICAL, PUBLIC :: ma97_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: ma97_available = .FALSE. private :: ip_, long_, lp_, rp_ ! Parameters (all private) diff --git a/hsl_subset/hsl_mc34/hsl_mc34r.f90 b/hsl_subset/hsl_mc34/hsl_mc34r.f90 index bdd054e..13ff9e3 100644 --- a/hsl_subset/hsl_mc34/hsl_mc34r.f90 +++ b/hsl_subset/hsl_mc34/hsl_mc34r.f90 @@ -6,7 +6,7 @@ MODULE hsl_mc34_real implicit none private public mc34_expand - LOGICAL, PUBLIC :: mc34_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mc34_available = .FALSE. interface mc34_expand module procedure mc34_expand_real end interface diff --git a/hsl_subset/hsl_mc64/hsl_mc64r.f90 b/hsl_subset/hsl_mc64/hsl_mc64r.f90 index 4445e5f..af80f13 100644 --- a/hsl_subset/hsl_mc64/hsl_mc64r.f90 +++ b/hsl_subset/hsl_mc64/hsl_mc64r.f90 @@ -14,7 +14,7 @@ MODULE hsl_mc64_real private public :: mc64_control, mc64_info, mc64_initialize, mc64_matching - LOGICAL, PUBLIC :: mc64_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mc64_available = .FALSE. TYPE mc64_control ! real(rp_) :: relax = 0.0_rp_ ! Relaxes matching diff --git a/hsl_subset/hsl_mc69/hsl_mc69r.f90 b/hsl_subset/hsl_mc69/hsl_mc69r.f90 index 0bfaf93..3a21c15 100644 --- a/hsl_subset/hsl_mc69/hsl_mc69r.f90 +++ b/hsl_subset/hsl_mc69/hsl_mc69r.f90 @@ -3,7 +3,7 @@ #include "hsl_subset.h" MODULE hsl_mc69_real - LOGICAL, PUBLIC :: ma87_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mc69_available = .FALSE. CONTAINS SUBROUTINE mc69r( ) END SUBROUTINE mc69r diff --git a/hsl_subset/hsl_mc80/hsl_mc80r.f90 b/hsl_subset/hsl_mc80/hsl_mc80r.f90 index da861cc..e8385a7 100644 --- a/hsl_subset/hsl_mc80/hsl_mc80r.f90 +++ b/hsl_subset/hsl_mc80/hsl_mc80r.f90 @@ -3,7 +3,7 @@ #include "hsl_subset.h" MODULE hsl_mc80_real - LOGICAL, PUBLIC :: mc80_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mc80_available = .FALSE. CONTAINS SUBROUTINE mc80r( ) END SUBROUTINE mc80r diff --git a/hsl_subset/hsl_mi20/hsl_mi20r.f90 b/hsl_subset/hsl_mi20/hsl_mi20r.f90 index ab376d5..fbb1d2d 100644 --- a/hsl_subset/hsl_mi20/hsl_mi20r.f90 +++ b/hsl_subset/hsl_mi20/hsl_mi20r.f90 @@ -14,7 +14,7 @@ module hsl_mi20_real implicit none private :: ip_, lp_, rp_ - LOGICAL, PUBLIC :: mi20_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mi20_available = .FALSE. type mi20_control integer(ip_) :: aggressive = 1 diff --git a/hsl_subset/hsl_mi28/hsl_mi28r.f90 b/hsl_subset/hsl_mi28/hsl_mi28r.f90 index bb3801e..ca1e746 100644 --- a/hsl_subset/hsl_mi28/hsl_mi28r.f90 +++ b/hsl_subset/hsl_mi28/hsl_mi28r.f90 @@ -13,7 +13,7 @@ module hsl_mi28_real private public :: mi28_keep, mi28_control, mi28_info public :: mi28_factorize, mi28_finalise, mi28_precondition, mi28_solve - LOGICAL, PUBLIC :: mi28_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mi28_available = .FALSE. real(rp_), parameter :: zero = 0.0_rp_ real(rp_), parameter :: one = 1.0_rp_ diff --git a/hsl_subset/hsl_mi35/hsl_mi35r.f90 b/hsl_subset/hsl_mi35/hsl_mi35r.f90 index 5d4d437..bf810df 100644 --- a/hsl_subset/hsl_mi35/hsl_mi35r.f90 +++ b/hsl_subset/hsl_mi35/hsl_mi35r.f90 @@ -14,7 +14,7 @@ module hsl_mi35_real public :: mi35_keep, mi35_control, mi35_info public :: mi35_factorize, mi35_finalise, mi35_precondition, mi35_solve public :: mi35_check_matrix, mi35_factorizeC, mi35_formC - LOGICAL, PUBLIC :: mi35_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: mi35_available = .FALSE. real(rp_), parameter :: zero = 0.0_rp_ real(rp_), parameter :: one = 1.0_rp_ diff --git a/hsl_subset/hsl_of01/hsl_of01r.f90 b/hsl_subset/hsl_of01/hsl_of01r.f90 index ee2505a..e33ef8a 100644 --- a/hsl_subset/hsl_of01/hsl_of01r.f90 +++ b/hsl_subset/hsl_of01/hsl_of01r.f90 @@ -5,7 +5,7 @@ MODULE hsl_of01_real use hsl_kinds, only: ip_, long_, lp_ private :: ip_, long_, lp_ - LOGICAL, PUBLIC :: of01_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: of01_available = .FALSE. integer(ip_), parameter :: maxpath = 400 integer(ip_), parameter :: maxname = 400 type of01_data_private diff --git a/hsl_subset/hsl_zb01/hsl_zb01r.f90 b/hsl_subset/hsl_zb01/hsl_zb01r.f90 index ffae873..a1706a3 100644 --- a/hsl_subset/hsl_zb01/hsl_zb01r.f90 +++ b/hsl_subset/hsl_zb01/hsl_zb01r.f90 @@ -3,7 +3,7 @@ #include "hsl_subset.h" MODULE hsl_zb01_real - LOGICAL, PUBLIC :: zb01_available = .FALSE. + LOGICAL, PUBLIC, PROTECTED :: zb01_available = .FALSE. CONTAINS SUBROUTINE zb01r( ) END SUBROUTINE zb01r diff --git a/hsl_subset/meson.build b/hsl_subset/meson.build index 838231e..2dbaa6e 100644 --- a/hsl_subset/meson.build +++ b/hsl_subset/meson.build @@ -2,7 +2,7 @@ project( 'hsl_subset', 'c', 'fortran', - version: '4.0.2', + version: '4.0.4', default_options: [ 'buildtype=release', 'libdir=lib', diff --git a/libhsl/meson.build b/libhsl/meson.build index 6d09502..08ccbb7 100644 --- a/libhsl/meson.build +++ b/libhsl/meson.build @@ -2,7 +2,7 @@ project( 'libHSL', 'c', 'fortran', - version: '4.0.2', + version: '4.0.4', default_options: [ 'buildtype=release', 'libdir=lib',