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

Update integration with PyStell-UW on main #83

Merged
merged 3 commits into from
Apr 10, 2024
Merged

Update integration with PyStell-UW on main #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0ea3826
Update integration with PyStell-UW
connoramoreno Apr 10, 2024
448247d
Update installation instructions
connoramoreno Apr 10, 2024
ddab3d7
Fix typo in installation instructions
connoramoreno Apr 10, 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: 2 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,10 @@ If you do not have a Coreform Cubit license, you may be able to get one through
Download and extract the PyStell-UW repository:

```bash
git clone --single-branch --branch old https://github.com/aaroncbader/pystell_uw.git
git clone https://github.com/aaroncbader/pystell_uw.git
```

or download the and extract the ZIP file from [PyStell-UW](https://github.com/aaroncbader/pystell_uw/tree/old). Once extracted, add the repository directory to your `PYTHONPATH`.

Note that the `old` branch of PyStell-UW is necessary because there are complications with its `master` branch that prevent its successful integration with ParaStell.
or download and extract the ZIP file from [PyStell-UW](https://github.com/aaroncbader/pystell_uw). Once extracted, add the repository directory to your `PYTHONPATH`.

## Install ParaStell
Download and extract the ParaStell repository:
Expand Down
4 changes: 2 additions & 2 deletions parastell.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import magnet_coils
import source_mesh
import log
import read_vmec
import src.pystell.read_vmec as read_vmec
import cadquery as cq
import cubit
import cad_to_dagmc
Expand Down Expand Up @@ -795,7 +795,7 @@ def parastell(
logger.info('New stellarator build')

# Load plasma equilibrium data
vmec = read_vmec.vmec_data(plas_eq)
vmec = read_vmec.VMECData(plas_eq)

components = {}

Expand Down