Skip to content

Commit 595122e

Browse files
carlodevcarlodev
committed
Merge branch 'JossPaper' of https://github.com/carlodev/SegregatedVMSSolver.jl into JossPaper
2 parents 4f1fa8c + ca0ead4 commit 595122e

File tree

10 files changed

+126
-16
lines changed

10 files changed

+126
-16
lines changed

‎.github/workflows/CI.yml‎

Lines changed: 86 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- JossPaper
77
tags: ['*']
88
jobs:
9-
REPLTests:
10-
name: SegregatedVMSSolver-Sequential
9+
REPLTestsCommons:
10+
name: Sequential-Commons
1111
runs-on: ${{ matrix.os }}
1212
strategy:
1313
fail-fast: false
@@ -24,7 +24,46 @@ jobs:
2424
with:
2525
version: ${{ matrix.version }}
2626
arch: ${{ matrix.arch }}
27-
- uses: actions/cache@v1
27+
- uses: actions/cache@v4
28+
env:
29+
cache-name: cache-artifacts
30+
with:
31+
path: ~/.julia/artifacts
32+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
33+
restore-keys: |
34+
${{ runner.os }}-test-${{ env.cache-name }}-
35+
${{ runner.os }}-test-
36+
${{ runner.os }}-
37+
- uses: julia-actions/julia-buildpkg@v1
38+
- uses: julia-actions/julia-runtest@v1
39+
- uses: julia-actions/julia-processcoverage@v1
40+
- name: Upload coverage to Codecov
41+
if: ${{ env.GITHUB_ACTIONS == 'true' }}
42+
uses: codecov/codecov-action@v4
43+
env:
44+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
45+
with:
46+
flags: sequential-commons
47+
48+
REPLTestsCases:
49+
name: Sequential-Cases
50+
runs-on: ${{ matrix.os }}
51+
strategy:
52+
fail-fast: false
53+
matrix:
54+
version:
55+
- '1.11.1'
56+
os:
57+
- ubuntu-latest
58+
arch:
59+
- x64
60+
steps:
61+
- uses: actions/checkout@v3
62+
- uses: julia-actions/setup-julia@latest
63+
with:
64+
version: ${{ matrix.version }}
65+
arch: ${{ matrix.arch }}
66+
- uses: actions/cache@v4
2867
env:
2968
cache-name: cache-artifacts
3069
with:
@@ -37,11 +76,52 @@ jobs:
3776
- uses: julia-actions/julia-buildpkg@v1
3877
- run: julia --project=. -e "include(joinpath(\"test\", \"sequential\", \"runtests.jl\"))"
3978
- uses: julia-actions/julia-processcoverage@v1
40-
- uses: codecov/codecov-action@v4
79+
- name: Upload coverage to Codecov
80+
if: ${{ env.GITHUB_ACTIONS == 'true' }}
81+
uses: codecov/codecov-action@v4
82+
env:
83+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
84+
with:
85+
flags: sequential-commons
86+
87+
UtilsTests:
88+
name: Sequential-Utils
89+
runs-on: ${{ matrix.os }}
90+
strategy:
91+
fail-fast: false
92+
matrix:
93+
version:
94+
- '1.11.1'
95+
os:
96+
- ubuntu-latest
97+
arch:
98+
- x64
99+
steps:
100+
- uses: actions/checkout@v3
101+
- uses: julia-actions/setup-julia@latest
102+
with:
103+
version: ${{ matrix.version }}
104+
arch: ${{ matrix.arch }}
105+
- uses: actions/cache@v4
106+
env:
107+
cache-name: cache-artifacts
108+
with:
109+
path: ~/.julia/artifacts
110+
key: ${{ runner.os }}-test-${{ env.cache-name }}-${{ hashFiles('**/Project.toml') }}
111+
restore-keys: |
112+
${{ runner.os }}-test-${{ env.cache-name }}-
113+
${{ runner.os }}-test-
114+
${{ runner.os }}-
115+
- uses: julia-actions/julia-buildpkg@v1
116+
- run: julia --project=. -e "include(joinpath(\"test\", \"UtilsTests\", \"runtests.jl\"))"
117+
- uses: julia-actions/julia-processcoverage@v1
118+
- name: Upload coverage to Codecov
119+
if: ${{ env.GITHUB_ACTIONS == 'true' }}
120+
uses: codecov/codecov-action@v4
41121
env:
42122
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
43123
with:
44-
threshold: 50%
124+
flags: sequential-utils
45125

46126
MPITests:
47127
name: SegregatedVMSSolver-MPI
@@ -61,7 +141,7 @@ jobs:
61141
with:
62142
version: ${{ matrix.version }}
63143
arch: ${{ matrix.arch }}
64-
- uses: actions/cache@v1
144+
- uses: actions/cache@v4
65145
env:
66146
cache-name: cache-artifacts
67147
with:

‎Project.toml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,27 @@ Trapz = "592b5752-818d-11e9-1e9a-2b8ca4a44cd1"
3232
UnPack = "3a884ed6-31ef-47d7-9d2a-63182c4928ed"
3333

3434
[compat]
35+
CSV = "0.10.15"
36+
DataFrames = "1.7.0"
3537
DataInterpolations = "6.6.0"
3638
DelimitedFiles = "1.9.1"
39+
FFTW = "1.8.0"
40+
FileIO = "1.16.6"
41+
FillArrays ="=1.13.0"
3742
Gridap = "=0.17.20"
3843
GridapDistributed = "=0.3.2"
3944
GridapGmsh = "=0.7.1"
4045
GridapPETSc = "=0.5.3"
46+
MPI ="=0.20.22"
47+
NearestNeighbors ="0.4.21"
48+
Parameters = "0.12.3"
49+
PartitionedArrays ="=0.3.4"
50+
Revise ="3.7.1"
51+
ScatteredInterpolation = "0.3.6"
4152
LinearAlgebra = "1.11.0"
4253
SparseArrays = "1.11.0"
4354
SyntheticEddyMethod = "=0.4.4"
55+
Trapz ="2.0.3"
4456
Test = "1.11.0"
4557
UnPack = "1.0.2"
58+
julia = "1.11.1"

‎src/Commons/SolverOptions.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ function create_PETSc_setup(M::AbstractMatrix,ksp_setup::Function)
5959
ss = symbolic_setup(solver, M)
6060
ns = numerical_setup(ss, M)
6161
# @check_error_code GridapPETSc.PETSC.KSPView(ns.ksp[],C_NULL)
62-
6362
return ns
6463
end
6564

‎src/utils/CreateVtu.jl‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module CreateVtu
33
using FileIO
44
export create_vtu_file
55

6-
function create_vtu_file(results_folder::String)
6+
function create_vtu_file(results_folder::String; step=1)
77
ff = cd(readdir, results_folder)
88

99

@@ -30,7 +30,7 @@ function create_vtu_file(results_folder::String)
3030
fname = ff_split[1][1] * ".pvd"
3131
io = open(fname , "w")
3232
println(io, initial_string)
33-
for i in idx_sort
33+
for i in idx_sort[1:step:end]
3434
println(io, "<DataSet timestep=\"$(time_step[i])\" part=\"0\" file=\"Results_vtu\\$(ff_file[i])\"/>")
3535
end
3636
println(io, end_string)
@@ -41,4 +41,5 @@ function create_vtu_file(results_folder::String)
4141
end
4242

4343

44+
4445
end

‎test/UtilsTests/CreateVtuTests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ using DataFrames
55
using SegregatedVMSSolver.CreateVtu
66

77

8-
fname = create_vtu_file("Results_vtu")
8+
fname = create_vtu_file(joinpath(@__DIR__,"Results_vtu"))
99
@test typeof(fname) == String
1010

1111
end #end module

‎test/UtilsTests/runtests.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ using Test
33
@testset "Utils" begin
44
include("ReadAirfoilResultsTests.jl")
55
include("WallDistanceTests.jl")
6-
include("CreateVtuTests.jl")
6+
# include("CreateVtuTests.jl")
77
end

‎test/runtests.jl‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
module SegregatedVMSSolverTests
2+
3+
using Test
4+
5+
6+
@testset "Sequential" begin include("sequential/runtests.jl") end
7+
8+
9+
10+
11+
end

‎test/sequential/SequentialTests.jl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ using PartitionedArrays
77
CommonsTests.tests_common(with_debug)
88
end
99

10-
@testset "Cases Tests Sequential" begin
11-
include(joinpath("..", "TestsCases", "TestsCases.jl"))
12-
TestsCases.tests_cases(with_debug)
13-
end
10+
# @testset "Cases Tests Sequential" begin
11+
# include(joinpath("..", "TestsCases", "TestsCases.jl"))
12+
# TestsCases.tests_cases(with_debug)
13+
# end
1414

1515

1616
end

‎test/sequential/runcases.jl‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
using Test
2+
using PartitionedArrays
3+
4+
@testset "Cases Tests Sequential" begin
5+
include(joinpath("..", "TestsCases", "TestsCases.jl"))
6+
TestsCases.tests_cases(with_debug)
7+
end

‎test/sequential/runtests.jl‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ using Test
66

77
@testset "Sequential" begin include( joinpath("SequentialTests.jl")) end
88

9-
@testset "Utils" begin include(joinpath("..","UtilsTests","runtests.jl")) end

0 commit comments

Comments
 (0)