Skip to content
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

Backport #10

Merged
merged 2 commits into from
Oct 13, 2024
Merged

Backport #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3ab39c
Backport the modifications on dummy HSL files
amontoison Oct 13, 2024
473aaea
Release 4.0.0
amontoison Oct 13, 2024
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
12 changes: 9 additions & 3 deletions hsl_subset/hsl_kb22/hsl_kb22l.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 10:30 GMT.

#include "hsl_subset.h"

MODULE hsl_kb22_long_integer
PRIVATE
PUBLIC :: KB22_build_heap, KB22_get_smallest
LOGICAL, PUBLIC, PARAMETER :: kb22_available = .FALSE.
CONTAINS
SUBROUTINE kb22l( )
END SUBROUTINE kb22l
SUBROUTINE KB22_build_heap( )
END SUBROUTINE KB22_build_heap

SUBROUTINE KB22_get_smallest( )
END SUBROUTINE KB22_get_smallest
END MODULE hsl_kb22_long_integer
5 changes: 3 additions & 2 deletions hsl_subset/hsl_ma48/hsl_ma48r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

Expand All @@ -10,12 +10,13 @@ module hsl_ma48_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
private

private
public :: ma48_factors,ma48_control,ma48_ainfo,ma48_finfo,ma48_sinfo, &
ma48_initialize,ma48_analyse,ma48_factorize,ma48_solve, &
ma48_finalize, ma48_get_perm,ma48_special_rows_and_cols, &
ma48_determinant
LOGICAL, PUBLIC, PARAMETER :: ma48_available = .FALSE.

interface ma48_initialize
module procedure ma48_initialize_real
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_ma54/hsl_ma54r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

MODULE hsl_ma54_real
LOGICAL, PUBLIC, PARAMETER :: ma54_available = .FALSE.
CONTAINS
SUBROUTINE ma54r( )
END SUBROUTINE ma54r
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_ma57/hsl_ma57r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:50 GMT.

#include "hsl_subset.h"

Expand All @@ -11,6 +11,7 @@ module hsl_ma57_real

implicit none
private :: ip_, rp_
LOGICAL, PUBLIC, PARAMETER :: ma57_available = .FALSE.

type ma57_factors
private
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_ma64/hsl_ma64r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

MODULE hsl_ma64_real
LOGICAL, PUBLIC, PARAMETER :: ma64_available = .FALSE.
CONTAINS
SUBROUTINE ma64r( )
END SUBROUTINE ma64r
Expand Down
4 changes: 3 additions & 1 deletion hsl_subset/hsl_ma77/hsl_ma77r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

Expand All @@ -14,6 +14,8 @@ module hsl_ma77_real
implicit none

private :: ip_, long_, lp_, rp_
LOGICAL, PUBLIC, PARAMETER :: ma77_available = .FALSE.

real (rp_), parameter, private :: one = 1.0_rp_
real (rp_), parameter, private :: zero = 0.0_rp_
integer(ip_), parameter, private :: nemin_default = 8
Expand Down
8 changes: 6 additions & 2 deletions hsl_subset/hsl_ma86/hsl_ma86r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

Expand All @@ -13,8 +13,12 @@ module hsl_ma86_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
private :: ip_, long_, lp_, rp_
public :: ma86_keep, ma86_control, ma86_info
public :: ma86_analyse, ma86_factor, ma86_factor_solve, ma86_solve, &
ma86_finalise
public :: ma86_get_n__
LOGICAL, PUBLIC, PARAMETER :: ma86_available = .FALSE.
private :: ip_, long_, lp_, rp_

! Numerical constants
real(rp_), parameter, private :: one = 1.0_rp_
Expand Down
13 changes: 9 additions & 4 deletions hsl_subset/hsl_ma87/hsl_ma87r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 10:30 GMT.

#include "hsl_subset.h"

Expand All @@ -12,8 +12,13 @@ module hsl_ma87_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
private :: ip_, long_, lp_, rp_

public :: ma87_keep, ma87_control, ma87_info
public :: ma87_analyse, ma87_factor, ma87_factor_solve, ma87_solve, &
ma87_sparse_fwd_solve, ma87_finalise
public :: ma87_get_n__
LOGICAL, PUBLIC, PARAMETER :: ma87_available = .FALSE.
private :: ip_, long_, lp_, rp_

! Parameters (all private)
! Data kinds
Expand Down Expand Up @@ -387,7 +392,7 @@ subroutine MA87_factor_solve_one_real(n, ptr, row, val, order, keep, control,&
& ' chosen are not all freely available with GALAHAD.', /, &
& ' If you have HSL (formerly the Harwell Subroutine', /, &
& ' Library), this option may be enabled by replacing the dummy ', /, &
& ' subroutine MA87_solve_one with its HSL namesake ', /, &
& ' subroutine MA87_solve_one with its HSL namesake ', /, &
& ' and dependencies. See ', /, &
& ' $GALAHAD/src/makedefs/packages for details.' )" )

Expand Down Expand Up @@ -507,7 +512,7 @@ subroutine MA87_solve_mult_real(nrhs,lx,x,order,keep, control,info,job)
info%stat = 0
end subroutine MA87_solve_mult_real

subroutine MA87_sparse_fwd_solve_real(nbi,bindex,b,order,invp, &
subroutine MA87_sparse_fwd_solve_real(nbi,bindex,b,order,invp, &
nxi,index,x,w,keep,control,info)
integer(ip_), intent(in) :: nbi ! # nonzero entries in the right-hand side
integer(ip_), intent(in) :: bindex(:) ! First nbi entries must hold
Expand Down
8 changes: 7 additions & 1 deletion hsl_subset/hsl_ma97/hsl_ma97r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

Expand All @@ -10,7 +10,13 @@ module hsl_ma97_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
public :: ma97_akeep, ma97_fkeep, ma97_control, ma97_info
public :: ma97_analyse, ma97_analyse_coord, ma97_factor, ma97_factor_solve, &
ma97_solve, ma97_solve_fredholm, ma97_free, ma97_finalise, &
ma97_enquire_posdef, ma97_enquire_indef, ma97_alter, &
ma97_lmultiply, ma97_sparse_fwd_solve
public :: ma97_get_n__, ma97_get_nz__
LOGICAL, PUBLIC, PARAMETER :: ma97_available = .FALSE.
private :: ip_, long_, lp_, rp_

! Parameters (all private)
Expand Down
13 changes: 10 additions & 3 deletions hsl_subset/hsl_mc34/hsl_mc34r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

MODULE hsl_mc34_real
implicit none
private
public mc34_expand
LOGICAL, PUBLIC, PARAMETER :: mc34_available = .FALSE.
interface mc34_expand
module procedure mc34_expand_real
end interface
CONTAINS
SUBROUTINE mc34r( )
END SUBROUTINE mc34r
SUBROUTINE mc34_expand_real( )
END SUBROUTINE mc34_expand_real
END MODULE hsl_mc34_real
3 changes: 2 additions & 1 deletion hsl_subset/hsl_mc64/hsl_mc64r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

Expand All @@ -14,6 +14,7 @@ MODULE hsl_mc64_real

private
public :: mc64_control, mc64_info, mc64_initialize, mc64_matching
LOGICAL, PUBLIC, PARAMETER :: mc64_available = .FALSE.

TYPE mc64_control
! real(rp_) :: relax = 0.0_rp_ ! Relaxes matching
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_mc69/hsl_mc69r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

MODULE hsl_mc69_real
LOGICAL, PUBLIC, PARAMETER :: ma87_available = .FALSE.
CONTAINS
SUBROUTINE mc69r( )
END SUBROUTINE mc69r
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_mc80/hsl_mc80r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

MODULE hsl_mc80_real
LOGICAL, PUBLIC, PARAMETER :: mc80_available = .FALSE.
CONTAINS
SUBROUTINE mc80r( )
END SUBROUTINE mc80r
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_mi20/hsl_mi20r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:15 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:50 GMT.

#include "hsl_subset.h"

Expand All @@ -14,6 +14,7 @@ module hsl_mi20_real

implicit none
private :: ip_, lp_, rp_
LOGICAL, PUBLIC, PARAMETER :: mi20_available = .FALSE.

type mi20_control
integer(ip_) :: aggressive = 1
Expand Down
5 changes: 3 additions & 2 deletions hsl_subset/hsl_mi28/hsl_mi28r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

Expand All @@ -9,10 +9,11 @@ module hsl_mi28_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
private

private
public :: mi28_keep, mi28_control, mi28_info
public :: mi28_factorize, mi28_finalise, mi28_precondition, mi28_solve
LOGICAL, PUBLIC, PARAMETER :: mi28_available = .FALSE.

real(rp_), parameter :: zero = 0.0_rp_
real(rp_), parameter :: one = 1.0_rp_
Expand Down
5 changes: 3 additions & 2 deletions hsl_subset/hsl_mi35/hsl_mi35r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 11:25 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

Expand All @@ -9,11 +9,12 @@ module hsl_mi35_real
USE HSL_SYMBOLS, ONLY: HSL_unavailable_option

implicit none
private

private
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, PARAMETER :: mi35_available = .FALSE.

real(rp_), parameter :: zero = 0.0_rp_
real(rp_), parameter :: one = 1.0_rp_
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_of01/hsl_of01r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 14:30 GMT.

#include "hsl_subset.h"

MODULE hsl_of01_real
use hsl_kinds, only: ip_, long_, lp_
private :: ip_, long_, lp_
LOGICAL, PUBLIC, PARAMETER :: of01_available = .FALSE.
integer(ip_), parameter :: maxpath = 400
integer(ip_), parameter :: maxname = 400
type of01_data_private
Expand Down
3 changes: 2 additions & 1 deletion hsl_subset/hsl_zb01/hsl_zb01r.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
! THIS VERSION: GALAHAD 5.0 - 2024-03-17 AT 09:00 GMT.
! THIS VERSION: GALAHAD 5.1 - 2024-10-11 AT 15:00 GMT.

#include "hsl_subset.h"

MODULE hsl_zb01_real
LOGICAL, PUBLIC, PARAMETER :: zb01_available = .FALSE.
CONTAINS
SUBROUTINE zb01r( )
END SUBROUTINE zb01r
Expand Down
2 changes: 1 addition & 1 deletion hsl_subset/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ project(
'hsl_subset',
'c',
'fortran',
version: '3.0.0',
version: '4.0.0',
default_options: [
'buildtype=release',
'libdir=lib',
Expand Down
2 changes: 1 addition & 1 deletion libhsl/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'libHSL',
'c',
version: '3.0.0',
version: '4.0.0',
default_options: [
'buildtype=release',
'libdir=lib',
Expand Down
Loading