Skip to content

Commit 3d1bcee

Browse files
authored
Merge pull request #164 from byuflowlab/dev
Merge dev: Compatibility with Julia v1.10
2 parents e99e5e4 + b277241 commit 3d1bcee

File tree

6 files changed

+32
-33
lines changed

6 files changed

+32
-33
lines changed

Project.toml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "FLOWUnsteady"
22
uuid = "b491798d-ac6e-455f-a27c-49c10bb0a666"
33
authors = ["Eduardo J. Alvarez <Edo.AlvarezR@gmail.com> and contributors"]
4-
version = "3.3.0"
4+
version = "3.3.2"
55

66
[deps]
77
PyPlot = "d330b81b-6aea-500a-939a-2ce795aea3ee"
@@ -21,10 +21,10 @@ VSPGeom = "9b3f6a95-fce2-4bc5-94a2-f99b39986ea6"
2121

2222
[compat]
2323
julia = "1.6"
24-
GeometricTools = "2.1.6"
25-
FLOWVPM = "3.0.1"
26-
FLOWVLM = "2.1.2"
27-
FLOWNoise = "2.3.2"
24+
GeometricTools = "2.2"
25+
FLOWVPM = "3.0"
26+
FLOWVLM = "2.1.3"
27+
FLOWNoise = "2.3.3"
2828
BPM = "2.0.1"
2929

3030
[extras]

docs/Project.toml

+4
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
11
[deps]
22
Documenter = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
3+
DocumenterTools = "35a29f4d-8980-5a13-9543-d66fff28ecb8"
4+
5+
[compat]
6+
Documenter = "0.27"

docs/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Build docs:
2-
* Install Documenter in Julia: `] add Documenter.jl`
2+
* Install Documenter in Julia: `] add Documenter#v0.27.25`
33
* Compile source files: `julia make.jl`(this will generate html files in `build/`
44
and push/deploy the documentation to GitHub Pages)
55

66
> You can also manually deploy documentation into the gh-pages branch for
7-
Github Pages: `mkdocs gh-deploy`. You will need to roll jinja2 back to v3.0.3
7+
Github Pages: `mkdocs gh-deploy`. You will need to roll jinja2 back to v3.0.3
88
for mkdocs to work: `pip install --force-reinstall -v "jinja2==3.0.3"`.
99

1010
Launching docs page (`build/`) locally:

docs/src/index.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -237,8 +237,7 @@ See the following publications for an in-depth dive into the theory and validati
237237

238238

239239

240-
**Ducted Fan:** [[Slides](http://edoalvar2.groups.et.byu.net/public/FLOWUnsteady/alvarez_2023-SLIDES-VPM_for_EDF_in_Non_Axisymmetric_Flow.pdf
241-
)]
240+
**Ducted Fan:** [[Slides](http://edoalvar2.groups.et.byu.net/public/FLOWUnsteady/alvarez_2023-SLIDES-VPM_for_EDF_in_Non_Axisymmetric_Flow.pdf)]
242241

243242
```@raw html
244243
<div style="position:relative;padding-top:50%;">

docs/src/installation/general.md

+15-21
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ FLOWUnsteady.
1717
## Julia
1818

1919
* Download and install Julia: [julialang.org](https://julialang.org/downloads)
20-
(currently we are only supporting up to Julia v1.8.5, so we recommend using
21-
[v1.8.5](https://julialang.org/downloads/oldreleases/) or
20+
(currently we are supporting up to Julia v1.10, so we recommend using
21+
[v1.10.2](https://julialang.org/downloads) or
2222
[v1.6.7 LTS](https://julialang.org/downloads/#long_term_support_release)
2323
)
2424
* Add Julia to user-level `bin` folder
@@ -28,7 +28,7 @@ FLOWUnsteady.
2828
Replace `/[user-specific-path/Julia-1.x.x]/` with the path where Julia got
2929
installed.
3030
For instance, in MacOS the full path looks like this:
31-
`/Applications/Julia-1.8.app/Contents/Resources/julia/bin/julia`
31+
`/Applications/Julia-1.10.app/Contents/Resources/julia/bin/julia`
3232

3333
If you were successfull, typing the following in the terminal will launch the
3434
Julia REPL:
@@ -47,7 +47,7 @@ julia
4747
Replace `/[user-specific-path/ParaView-5.x.x]/` with the path where ParaView got
4848
installed.
4949
For instance, in MacOS the full path looks like this:
50-
`/Applications/ParaView-5.11.0.app/Contents/MacOS/paraview`
50+
`/Applications/ParaView-5.12.0.app/Contents/MacOS/paraview`
5151

5252
If you were successfull, typing the following in the terminal will launch the
5353
ParaView:
@@ -81,6 +81,13 @@ ParaView will then pull up with a rendering of a cube (click the `Apply` button
8181
</p>
8282
```
8383

84+
## *(Optional)* OpenVSP
85+
FLOWUnsteady can import geometry created in [OpenVSP](https://openvsp.org/) using [VSPGeom.jl](https://github.com/byuflowlab/VSPGeom.jl).
86+
We recommend [installing OpenVSP](https://openvsp.org/download.php) in your system, then adding VSPGeom.jl to Julia:
87+
```julia
88+
] add VSPGeom
89+
```
90+
8491

8592
## [PyCall](@id pycall)
8693

@@ -136,7 +143,7 @@ first you will have to install FLOWExaFMM and compile ExaFMM, as follows.
136143
* *[Julia REPL]* Install CxxWrap:
137144
```julia
138145
import Pkg
139-
Pkg.add(name="CxxWrap", version="0.11.2")
146+
Pkg.add(name="CxxWrap", version="0.15.0")
140147
```
141148

142149
* *[Terminal]* Clone FLOWExaFMM:
@@ -175,7 +182,7 @@ add FLOWVPM:
175182
```julia
176183
] test FLOWExaFMM
177184
```
178-
This will return a heart-warming "Hello world!" if ExaFMM was correctly compiled.
185+
If ExaFMM was correctly compiled, this will return a heart-warming "Hello world!"
179186

180187

181188
* Add FLOWVPM:
@@ -198,19 +205,6 @@ If you run into any issues, please try the following:
198205
If issues persist, please check the resolved issues in [the FLOWExaFMM repo](https://github.com/byuflowlab/FLOWExaFMM.jl/issues?q=), the discussion forum in [the FLOWUnsteady repo](https://github.com/byuflowlab/FLOWUnsteady/discussions?discussions_q=),
199206
and feel free to open a new issue or discussion for help.
200207

201-
## VSPGeom
202-
FLOWUnsteady can import geometry created in [OpenVSP](https://openvsp.org/) using [VSPGeom.jl](https://github.com/byuflowlab/VSPGeom.jl).
203-
204-
* Add VSPgeom:
205-
```julia
206-
] add VSPGeom
207-
```
208-
209-
* *[Optional]* Test VSPGeom:
210-
```julia
211-
] test VSPGeom
212-
```
213-
214208
## Other Packages
215209
Run the following commands in the Julia REPL to add some dependencies that are not
216210
in the official Julia registry:
@@ -219,8 +213,8 @@ import Pkg
219213

220214
url = "https://github.com/byuflowlab/"
221215

222-
packages = (("AirfoilPrep.jl", "v2.1.2"), ("FLOWVLM", "v2.1.2"),
223-
("BPM.jl", "v2.0.1"), ("FLOWNoise", "v2.3.2"))
216+
packages = [ ("AirfoilPrep.jl", "v2.1.2"), ("FLOWVLM", "v2.1.3"),
217+
("FLOWNoise", "v2.3.3"), ("BPM.jl", "v2.0.1") ]
224218

225219
Pkg.add([ Pkg.PackageSpec(; url=url*name, rev=v) for (name, v) in packages ])
226220
```

docs/src/installation/windows.md

+5-3
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,19 @@ Once inside WSL, do the following
3333
```
3434

3535
## Install Julia
36+
Still inside WSL,
37+
3638
* Download Julia:
3739
```bash
38-
wget -O julia.tar.gz "https://julialang-s3.julialang.org/bin/linux/x64/1.8/julia-1.8.5-linux-x86_64.tar.gz"
40+
wget -O julia.tar.gz "https://julialang-s3.julialang.org/bin/linux/x64/1.10/julia-1.10.2-linux-x86_64.tar.gz"
3941
```
4042
* Decompress Julia:
4143
```bash
4244
tar -xvf julia.tar.gz -C ~/Programs/
4345
```
4446
* Add Julia to user-level path:
4547
```bash
46-
sudo ln -s ~/Programs/julia-1.8.5/bin/julia /usr/local/bin/
48+
sudo ln -s ~/Programs/julia-1.10.2/bin/julia /usr/local/bin/
4749
```
4850

4951
## Install ParaView
@@ -64,4 +66,4 @@ Once inside WSL, do the following
6466
---
6567

6668
**Now you can proceed with [the general instructions](@ref installation)**
67-
(you can skip the Julia and ParaView since we already took care of that)
69+
(you can skip the Julia and ParaView instructions since we already took care of that)

0 commit comments

Comments
 (0)