Skip to content

Commit 5936d99

Browse files
authored
Merge pull request #416 from jtwhite79/feat_svda
Feat svda
2 parents a459a8c + 8007b32 commit 5936d99

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2980
-2075
lines changed

.github/workflows/ci-devenv.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ jobs:
2727
shell: ${{ matrix.shell }}
2828

2929
steps:
30-
- uses: actions/checkout@v5
30+
- uses: actions/checkout@v6
3131

3232
- name: Set Windows ENV
3333
if: runner.os == 'Windows'
3434
uses: ilammy/msvc-dev-cmd@v1
3535

36-
- uses: prefix-dev/setup-pixi@v0.9.2
36+
- uses: prefix-dev/setup-pixi@v0.9.3
3737
with:
3838
pixi-version: v0.58.0
3939
manifest-path: "pixi.toml"
@@ -52,13 +52,13 @@ jobs:
5252
# pixi run test
5353

5454
- name: Upload binaries
55-
uses: actions/upload-artifact@v5
55+
uses: actions/upload-artifact@v6
5656
with:
5757
name: binaries-${{ matrix.os }}
5858
path: bin
5959

6060
- name: Upload test results
61-
uses: actions/upload-artifact@v5
61+
uses: actions/upload-artifact@v6
6262
with:
6363
name: test-results-${{ matrix.os }}
6464
path: benchmarks/large_fake_test/master

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@ jobs:
4141
- { test_dir: "pestpp-mou_benchmarks", test_repo: "https://github.com/pestpp/pestpp-mou_benchmarks", test_script: "../benchmarks/henry_test.py"}
4242
- { test_dir: "pestpp-da_benchmarks", test_repo: "https://github.com/pestpp/pestpp-da_benchmarks", test_script: "../benchmarks/da_tests.py"}
4343
- { test_dir: "pestpp-da_benchmarks", test_repo: "https://github.com/pestpp/pestpp-da_benchmarks", test_script: "../benchmarks/lorenz96_tests.py"}
44-
- { test_dir: "pestpp-sqp_benchmarks", test_repo: "https://github.com/pestpp/pestpp-sqp_benchmarks", test_script: "../benchmarks/sqp_tests.py"}
44+
#- { test_dir: "pestpp-sqp_benchmarks", test_repo: "https://github.com/pestpp/pestpp-sqp_benchmarks", test_script: "../benchmarks/sqp_tests.py"}
4545
include:
4646
- os: ubuntu-latest
4747
env: { test_dir: "pestpp-mou_benchmarks", test_repo: "https://github.com/pestpp/pestpp-mou_benchmarks", test_script: "../benchmarks/mou_tests_2.py"}
4848
env: ${{ matrix.env }}
4949

5050
steps:
51-
- uses: actions/checkout@v5
51+
- uses: actions/checkout@v6
5252

5353
# - name: Cache Miniconda
5454
# uses: actions/cache@v2.1.0

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ jobs:
2424
run:
2525
shell: bash -l {0}
2626
steps:
27-
- uses: actions/checkout@v5
27+
- uses: actions/checkout@v6
2828
with:
2929
repository: usgs/pestpp
3030
ref: ${{ inputs.branch }}
3131

32-
- uses: prefix-dev/setup-pixi@v0.9.2
32+
- uses: prefix-dev/setup-pixi@v0.9.3
3333
with:
3434
pixi-version: v0.41.4
3535

@@ -61,7 +61,7 @@ jobs:
6161
rm -r $path/*/ || true
6262
6363
- name: Upload distribution
64-
uses: actions/upload-artifact@v5
64+
uses: actions/upload-artifact@v6
6565
with:
6666
name: pestpp-${{ inputs.version }}-${{ steps.ostag.outputs.ostag }}
6767
path: pestpp-${{ inputs.version }}-${{ steps.ostag.outputs.ostag }}

benchmarks/basic_tests.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,10 +2125,13 @@ def parse_pst_test():
21252125

21262126

21272127

2128+
2129+
21282130
if __name__ == "__main__":
21292131
#parse_pst_test()
21302132
#basic_test()
2131-
nonascii_path_test()
2133+
#mf6_v5_glm_test()
2134+
#nonascii_path_test()
21322135

21332136
#mf6_v5_ies_nonpersistent_test()
21342137
#large_fake_test()
@@ -2143,7 +2146,7 @@ def parse_pst_test():
21432146
#plot_collapse_invest()
21442147

21452148
#run()
2146-
#mf6_v5_ies_test()
2149+
21472150
#prep_ends()
21482151
#sweep_bin_test()
21492152
# mf6_v5_sen_test()
@@ -2185,7 +2188,7 @@ def parse_pst_test():
21852188
#shutil.copy2(os.path.join("..","exe","windows","x64","Debug","pestpp-ies.exe"),os.path.join("..","bin","win","pestpp-ies.exe"))
21862189
#tplins1_test()
21872190

2188-
#fr_timeout_test()
2191+
fr_timeout_test()
21892192
#mf6_v5_ies_test()
21902193
#mf6_v5_sen_test()
21912194

0 commit comments

Comments
 (0)