Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fixes and documentation updates #345

Merged
merged 12 commits into from
Jun 10, 2024
Merged

Bug fixes and documentation updates #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
51539c9
Set types on wrap functions
dzalkind May 7, 2024
2c5696d
Update IEA-15 inputs
dzalkind May 8, 2024
c66ad25
Update installation instructions -- draft
dzalkind May 8, 2024
eae6dc5
Change to new AF Coords
dzalkind May 8, 2024
03ce3cf
Fix IEA15 airfoils again
dzalkind May 8, 2024
5a85187
Try latest setup_fortran action
dzalkind May 9, 2024
3fe677d
Add UAStart/End location writing
dzalkind May 9, 2024
57bcb8f
Merge remote-tracking branch 'upstream/vbf' into vbf
dzalkind May 9, 2024
fe34007
Try intel-classic compiler
dzalkind May 9, 2024
07114c8
Add developer docs about api changes
dzalkind May 10, 2024
a75a2e7
Try macos-latest in CI
dzalkind May 10, 2024
70e6312
trying to improve conda and pypi builds (#351)
gbarter Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/CI_rosco-compile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@ jobs:
strategy:
fail-fast: false #true
matrix:
os: ["ubuntu-latest", "macOS-13", "windows-latest"] #mac-13 intel, mac-14 arm
os: ["ubuntu-latest", "macOS-latest", "windows-latest"] #mac-13 intel, mac-14 arm
python-version: ["3.9", "3.10", "3.11", "3.12"]

steps:
- name: Setup GNU Fortran
if: false == contains( matrix.os, 'windows')
uses: awvwgk/setup-fortran@v1 #modflowpy/install-intelfortran-action@v1 #
uses: fortran-lang/setup-fortran@v1.6
# with:
# compiler: intel-classic

- name: Install compiler
if: false == contains( matrix.os, 'windows')
Expand Down
40 changes: 35 additions & 5 deletions .github/workflows/Publish_ROSCO.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,15 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, windows-latest, macos-13, macos-14]
os: [ubuntu-latest, windows-latest, macos-12, macos-13, macos-14]

steps:
- name: Set up QEMU
if: runner.os == 'Linux'
uses: docker/setup-qemu-action@v3
with:
platforms: all

- name: Setup GNU Fortran
if: false == contains( matrix.os, 'windows')
uses: awvwgk/setup-fortran@v1
Expand Down Expand Up @@ -51,16 +57,40 @@ jobs:
- name: Checkout
uses: actions/checkout@v4

- name: Build wheels mac and linux
if: false == contains( matrix.os, 'windows')
uses: pypa/cibuildwheel@v2.17.0
- name: Build wheels linux
if: contains( matrix.os, 'ubuntu')
uses: pypa/cibuildwheel@v2.18.1
env:
CC: ${{ steps.install_cc.outputs.cc }}
CXX: ${{ steps.install_cc.outputs.cxx }}

- name: Build wheels mac-12
if: contains( matrix.os, 'macos-12')
uses: pypa/cibuildwheel@v2.18.1
env:
CC: ${{ steps.install_cc.outputs.cc }}
CXX: ${{ steps.install_cc.outputs.cxx }}
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="12.0"

- name: Build wheels mac-13
if: contains( matrix.os, 'macos-13')
uses: pypa/cibuildwheel@v2.18.1
env:
CC: ${{ steps.install_cc.outputs.cc }}
CXX: ${{ steps.install_cc.outputs.cxx }}
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="13.0"

- name: Build wheels mac-14
if: contains( matrix.os, 'macos-14')
uses: pypa/cibuildwheel@v2.18.1
env:
CC: ${{ steps.install_cc.outputs.cc }}
CXX: ${{ steps.install_cc.outputs.cxx }}
CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET="14.0"

- name: Build wheels windows
if: contains( matrix.os, 'windows')
uses: pypa/cibuildwheel@v2.17.0
uses: pypa/cibuildwheel@v2.18.1

- uses: actions/upload-artifact@v4
with:
Expand Down
78 changes: 39 additions & 39 deletions ...-15-240-RWT_AeroDyn15_Polar_00_Coords.txt → ...i/Airfoils/IEA-15-240-RWT_AF00_Coords.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
! ......... x-y coordinates are next if NumCoords > 0 .............
! x-y coordinate of airfoil reference
! x/c y/c
0.504545 0.
0.500000 0
! coordinates of airfoil shape
! interpolation to 200 points
! x/c y/c
1.00000000000000e+00 -5.22832942930268e-16
1.00000000000000e+00 -5.22829392626822e-16
9.99429683992583e-01 -2.22597407115582e-02
9.98063017832965e-01 -4.44580348954677e-02
9.95573914266674e-01 -6.65618134473914e-02
9.92086309749559e-01 -8.85198205325816e-02
9.92086309749560e-01 -8.85198205325816e-02
9.87686148675057e-01 -1.10275272231260e-01
9.82330525170640e-01 -1.31784370919739e-01
9.76011908335692e-01 -1.53006617635088e-01
Expand All @@ -30,7 +30,7 @@
8.04073832217581e-01 -3.96914898117900e-01
7.87191529885653e-01 -4.09289340064311e-01
7.69897919101553e-01 -4.20894001702843e-01
7.52252341235159e-01 -4.31703640475795e-01
7.52252341235159e-01 -4.31703640475796e-01
7.34291349178558e-01 -4.41704116420428e-01
7.16044924955764e-01 -4.50916295010545e-01
6.97571640033109e-01 -4.59311192391506e-01
Expand All @@ -46,62 +46,62 @@
5.08535950506088e-01 -4.99900147123151e-01
4.89992355470388e-01 -4.99865122336167e-01
4.71632114506831e-01 -4.99152990523336e-01
4.53492503744347e-01 -4.97865574847876e-01
4.53492503744348e-01 -4.97865574847876e-01
4.35593302897673e-01 -4.95849221396458e-01
4.17956065616942e-01 -4.93220204257438e-01
4.00609748442576e-01 -4.90034017714886e-01
3.83560931606009e-01 -4.86240654381211e-01
3.66843215733716e-01 -4.81953122075711e-01
3.50457316320503e-01 -4.77107036591688e-01
3.34434484008630e-01 -4.71801617147633e-01
3.34434484008630e-01 -4.71801617147634e-01
3.18774100329315e-01 -4.65997503105357e-01
3.03499623121295e-01 -4.59771833639973e-01
2.88611293565648e-01 -4.53111012774598e-01
2.74124386665666e-01 -4.46071472676040e-01
2.60041455523719e-01 -4.38653996586565e-01
2.46374872015917e-01 -4.30897288076141e-01
2.33123443938834e-01 -4.22812892154316e-01
2.20293777810423e-01 -4.14442160590302e-01
2.46374872015918e-01 -4.30897288076141e-01
2.33123443938833e-01 -4.22812892154316e-01
2.20293777810423e-01 -4.14442160590301e-01
2.07883282965331e-01 -4.05790731420267e-01
1.95902956391646e-01 -3.96897110059902e-01
1.84341253066628e-01 -3.87763028932806e-01
1.73213930954160e-01 -3.78432781857511e-01
1.73213930954161e-01 -3.78432781857511e-01
1.62499176129638e-01 -3.68901685535316e-01
1.52214602777260e-01 -3.59220819204806e-01
1.52214602777259e-01 -3.59220819204806e-01
1.42331759398971e-01 -3.49381794975500e-01
1.32872111539190e-01 -3.39428678290192e-01
1.23806439629760e-01 -3.29359452404754e-01
1.15147623386077e-01 -3.19202364510091e-01
1.06887208802748e-01 -3.08971834769008e-01
1.06887208802748e-01 -3.08971834769009e-01
9.90071115215634e-02 -2.98675440643128e-01
9.15234043853439e-02 -2.88346537239591e-01
9.15234043853440e-02 -2.88346537239591e-01
8.43970428172224e-02 -2.77979120522002e-01
7.76464790199521e-02 -2.67604205770439e-01
7.12479082120209e-02 -2.57229212452774e-01
7.12479082120208e-02 -2.57229212452774e-01
6.51878662973747e-02 -2.46861090082763e-01
5.94874721274202e-02 -2.36524433012696e-01
5.94874721274203e-02 -2.36524433012697e-01
5.41002464180900e-02 -2.26213901273871e-01
4.90378786701877e-02 -2.15949074862572e-01
4.43003497573338e-02 -2.05745246473815e-01
3.98423597346806e-02 -1.95597654428208e-01
4.43003497573340e-02 -2.05745246473815e-01
3.98423597346805e-02 -1.95597654428208e-01
3.56899752436130e-02 -1.85525503303304e-01
3.18292350050658e-02 -1.75535988753057e-01
2.82200072057899e-02 -1.65626936732462e-01
2.48925247792699e-02 -1.55815221490220e-01
2.18286683030034e-02 -1.46105621815703e-01
1.89846947131331e-02 -1.36495337998243e-01
3.18292350050659e-02 -1.75535988753057e-01
2.82200072057900e-02 -1.65626936732462e-01
2.48925247792698e-02 -1.55815221490219e-01
2.18286683030035e-02 -1.46105621815703e-01
1.89846947131332e-02 -1.36495337998243e-01
1.63921917020335e-02 -1.26998300581103e-01
1.40446346341990e-02 -1.17620770590061e-01
1.18798249846349e-02 -1.08356847039079e-01
9.93094518736223e-03 -9.92166214620375e-02
1.18798249846349e-02 -1.08356847039080e-01
9.93094518736226e-03 -9.92166214620377e-02
8.21940795734749e-03 -9.02084101294225e-02
6.65838622137879e-03 -8.13254351098410e-02
5.26774192850643e-03 -7.25722234042700e-02
4.09515753852961e-03 -6.39564017315716e-02
3.09878859713640e-03 -5.54780130210999e-02
3.09878859713642e-03 -5.54780130211000e-02
2.19660773551101e-03 -4.71320046999757e-02
1.46264176301869e-03 -3.89244052604170e-02
9.64484608297914e-04 -3.08606101713945e-02
9.64484608297922e-04 -3.08606101713947e-02
5.99373867982851e-04 -2.29362359459691e-02
2.90086645599082e-04 -1.51487658773967e-02
7.80707788302466e-05 -7.50222207649338e-03
Expand All @@ -119,45 +119,45 @@
8.18368429859057e-03 9.00120990085718e-02
9.88361416849065e-03 9.89814202866229e-02
1.18176401547236e-02 1.08079023747493e-01
1.39661993216829e-02 1.17296891553284e-01
1.39661993216830e-02 1.17296891553284e-01
1.62951420791042e-02 1.26624818507885e-01
1.88631937781153e-02 1.36068234819796e-01
2.16807137532775e-02 1.45621741073938e-01
2.47159162958630e-02 1.55271505652796e-01
2.80064400105862e-02 1.65019126539152e-01
2.80064400105864e-02 1.65019126539152e-01
3.15762558914965e-02 1.74861450420233e-01
3.53948396168776e-02 1.84781748500356e-01
3.94949825480075e-02 1.94780451150684e-01
4.38979282781582e-02 2.04852826049369e-01
4.85758075737765e-02 2.14979335736815e-01
5.35679916138119e-02 2.25163248876704e-01
5.35679916138118e-02 2.25163248876704e-01
5.88818211488708e-02 2.35392575398327e-01
6.45001629027312e-02 2.45645861854957e-01
6.45001629027313e-02 2.45645861854958e-01
7.04692046391145e-02 2.55928809695428e-01
7.67740309924711e-02 2.66220088966340e-01
7.67740309924709e-02 2.66220088966340e-01
8.34162127168367e-02 2.76507393790272e-01
9.04290195190654e-02 2.86789711779561e-01
9.04290195190656e-02 2.86789711779561e-01
9.77906533229447e-02 2.97034361595414e-01
1.05536187198748e-01 3.07245770330167e-01
1.13658760041779e-01 3.17397798197942e-01
1.22161483318940e-01 3.27472514118938e-01
1.31067498602735e-01 3.37467155091885e-01
1.31067498602735e-01 3.37467155091884e-01
1.40354649921884e-01 3.47346400530541e-01
1.50055110786138e-01 3.57117293892256e-01
1.60148962661562e-01 3.66736829146265e-01
1.70658187899640e-01 3.76209016178366e-01
1.81574957422924e-01 3.85495420277773e-01
1.92907571409635e-01 3.94583247665971e-01
2.04657634577812e-01 4.03452252859203e-01
2.16817353069425e-01 4.12073654675103e-01
2.16817353069424e-01 4.12073654675103e-01
2.29396483963478e-01 4.20441260405522e-01
2.42377800694080e-01 4.28515729124923e-01
2.55773624268338e-01 4.36297014051329e-01
2.69566785632899e-01 4.43730784236712e-01
2.83765797226135e-01 4.50825718973627e-01
2.98347982887804e-01 4.57529313046837e-01
3.13318978785268e-01 4.63848274999177e-01
3.28658461892810e-01 4.69727033948470e-01
3.28658461892810e-01 4.69727033948469e-01
3.44364941645546e-01 4.75166089488011e-01
3.60419773725681e-01 4.80124895665173e-01
3.76811233766957e-01 4.84580156948735e-01
Expand All @@ -178,7 +178,7 @@
6.48926781663159e-01 4.77299436027394e-01
6.67570206424973e-01 4.71090906382616e-01
6.86088429590952e-01 4.64085564448580e-01
7.04445389043917e-01 4.56285153530383e-01
7.04445389043917e-01 4.56285153530384e-01
7.22592093722966e-01 4.47721154132331e-01
7.40501800453524e-01 4.38357128523673e-01
7.58125457122835e-01 4.28212344239085e-01
Expand All @@ -194,8 +194,8 @@
9.09954680076662e-01 2.86240968660934e-01
9.21851471402547e-01 2.68396507929684e-01
9.33012836658427e-01 2.50001405518451e-01
9.43389278969050e-01 2.31088842332577e-01
9.52973153850560e-01 2.11684808241657e-01
9.43389278969050e-01 2.31088842332578e-01
9.52973153850559e-01 2.11684808241657e-01
9.61743130827061e-01 1.91832340326070e-01
9.69640690675464e-01 1.71577158818629e-01
9.76664215898664e-01 1.50951670528481e-01
Expand All @@ -205,4 +205,4 @@
9.95693518775914e-01 6.56397719044068e-02
9.98120489340015e-01 4.38394581414280e-02
9.99443037908705e-01 2.19496513968833e-02
1.00000000000000e+00 -5.26302389882222e-16
1.00000000000000e+00 -5.26828685157063e-16
Loading
Loading