diff --git a/lib/SimpleNonlinearSolve/.github/workflows/CI.yml b/lib/SimpleNonlinearSolve/.github/workflows/CI.yml index c8d041ecf..80a2aea7b 100644 --- a/lib/SimpleNonlinearSolve/.github/workflows/CI.yml +++ b/lib/SimpleNonlinearSolve/.github/workflows/CI.yml @@ -2,10 +2,10 @@ name: CI on: pull_request: branches: - - master + - main push: branches: - - master + - main jobs: test: runs-on: ubuntu-latest diff --git a/lib/SimpleNonlinearSolve/.github/workflows/Documentation.yml b/lib/SimpleNonlinearSolve/.github/workflows/Documentation.yml deleted file mode 100644 index f64a315b6..000000000 --- a/lib/SimpleNonlinearSolve/.github/workflows/Documentation.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: Documentation - -on: - push: - branches: - - master - - 'release-' - tags: '*' - pull_request: - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: julia-actions/setup-julia@latest - with: - version: '1' - - name: Install dependencies - run: julia --project=docs/ -e 'using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()' - - name: Build and deploy - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # For authentication with GitHub Actions token - DOCUMENTER_KEY: ${{ secrets.DOCUMENTER_KEY }} # For authentication with SSH deploy key - run: julia --project=docs/ --code-coverage=user docs/make.jl - - uses: julia-actions/julia-processcoverage@v1 - - uses: codecov/codecov-action@v1 - with: - file: lcov.info diff --git a/lib/SimpleNonlinearSolve/.github/workflows/Downstream.yml b/lib/SimpleNonlinearSolve/.github/workflows/Downstream.yml index 916a33b4b..122cccf4d 100644 --- a/lib/SimpleNonlinearSolve/.github/workflows/Downstream.yml +++ b/lib/SimpleNonlinearSolve/.github/workflows/Downstream.yml @@ -1,7 +1,7 @@ name: IntegrationTest on: push: - branches: [master] + branches: [main] tags: [v*] pull_request: diff --git a/lib/SimpleNonlinearSolve/.github/workflows/FormatCheck.yml b/lib/SimpleNonlinearSolve/.github/workflows/FormatCheck.yml index 2a3517a0f..e4e3512e2 100644 --- a/lib/SimpleNonlinearSolve/.github/workflows/FormatCheck.yml +++ b/lib/SimpleNonlinearSolve/.github/workflows/FormatCheck.yml @@ -3,7 +3,7 @@ name: format-check on: push: branches: - - 'master' + - 'main' - 'release-' tags: '*' pull_request: diff --git a/lib/SimpleNonlinearSolve/src/raphson.jl b/lib/SimpleNonlinearSolve/src/raphson.jl index 6a5d235e0..1f23debd7 100644 --- a/lib/SimpleNonlinearSolve/src/raphson.jl +++ b/lib/SimpleNonlinearSolve/src/raphson.jl @@ -7,8 +7,8 @@ struct SimpleNewtonRaphson{CS, AD, FDT} <: AbstractNewtonAlgorithm{CS, AD, FDT} end function SciMLBase.solve(prob::NonlinearProblem, - alg::SimpleNewtonRaphson, args...; xatol = nothing, - xrtol = nothing, + alg::SimpleNewtonRaphson, args...; abstol = nothing, + reltol = nothing, maxiters = 1000, kwargs...) f = Base.Fix2(prob.f, prob.p) x = float(prob.u0) @@ -19,8 +19,8 @@ function SciMLBase.solve(prob::NonlinearProblem, error("SimpleNewtonRaphson currently only supports out-of-place nonlinear problems") end - atol = xatol !== nothing ? xatol : oneunit(eltype(T)) * (eps(one(eltype(T))))^(4 // 5) - rtol = xrtol !== nothing ? xrtol : eps(one(eltype(T)))^(4 // 5) + atol = abstol !== nothing ? abstol : oneunit(eltype(T)) * (eps(one(eltype(T))))^(4 // 5) + rtol = reltol !== nothing ? reltol : eps(one(eltype(T)))^(4 // 5) if typeof(x) <: Number xo = oftype(one(eltype(x)), Inf)