From caf0a42de4b5e04c2256104b1b6df78c9dca8123 Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Fri, 6 Sep 2024 10:49:28 -0500 Subject: [PATCH 1/5] Fix array indexing issue --- src/nonlin_least_squares.f90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/nonlin_least_squares.f90 b/src/nonlin_least_squares.f90 index 5582551..870db5b 100644 --- a/src/nonlin_least_squares.f90 +++ b/src/nonlin_least_squares.f90 @@ -675,7 +675,7 @@ subroutine lmpar(r, ipvt, diag, qtb, delta, par, x, sdiag, wa1, wa2) temp = sqrt(par) wa1 = temp * diag call lmsolve(r(1:n,1:n), ipvt, wa1, qtb, x, sdiag, wa2) - wa2 = diag * x + wa2(1:n) = diag * x dxnorm = norm2(wa2) temp = fp fp = dxnorm - delta From 4780f8f59bfa05122aa4f215e3a130b375e9709e Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Fri, 6 Sep 2024 10:50:04 -0500 Subject: [PATCH 2/5] Update version information --- CMakeLists.txt | 2 +- fpm.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc71a2f..67c27a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.24) project( nonlin LANGUAGES Fortran - VERSION 1.5.2 + VERSION 1.5.3 ) # Get helper macros and functions diff --git a/fpm.toml b/fpm.toml index e362e02..c392f9e 100644 --- a/fpm.toml +++ b/fpm.toml @@ -1,5 +1,5 @@ name = "nonlin" -version = "1.5.2" +version = "1.5.3" license = "GPL-3.0" author = "Jason Christopherson" maintainer = "Jason Christopherson" From 93a8708bced89ded5bcf2b77af99cd36b573f2a6 Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Fri, 6 Sep 2024 10:54:14 -0500 Subject: [PATCH 3/5] Update MacOS version --- .github/workflows/fpm.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/fpm.yml b/.github/workflows/fpm.yml index 9d67128..e97ea32 100644 --- a/.github/workflows/fpm.yml +++ b/.github/workflows/fpm.yml @@ -8,13 +8,13 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-11] + os: [ubuntu-latest, macos-latest] gcc_v: [10] # Version of GFortran we want to use. include: - os: ubuntu-latest os-arch: linux-x86_64 - - os: macos-11 + - os: macos-latest os-arch: macos-x86_64 env: From 0a390c917edd58c98fe707695dfc6493a15e3b05 Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Fri, 6 Sep 2024 10:55:24 -0500 Subject: [PATCH 4/5] Remove MacOS --- .github/workflows/fpm.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/fpm.yml b/.github/workflows/fpm.yml index e97ea32..978351b 100644 --- a/.github/workflows/fpm.yml +++ b/.github/workflows/fpm.yml @@ -8,15 +8,12 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-latest, macos-latest] + os: [ubuntu-latest] gcc_v: [10] # Version of GFortran we want to use. include: - os: ubuntu-latest os-arch: linux-x86_64 - - os: macos-latest - os-arch: macos-x86_64 - env: FC: gfortran GCC_V: ${{ matrix.gcc_v }} From 09606b992915e190d186905245464b644eef2770 Mon Sep 17 00:00:00 2001 From: jchristopherson Date: Fri, 6 Sep 2024 11:00:38 -0500 Subject: [PATCH 5/5] Update documentation --- docs/html/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/html/index.html b/docs/html/index.html index 299e493..95b661d 100644 --- a/docs/html/index.html +++ b/docs/html/index.html @@ -27,7 +27,7 @@ -
nonlin 1.5.2 +
nonlin 1.5.3
A library that provides routines to compute the solutions to systems of nonlinear equations.