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.

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

Plasma3 d #31

Merged
merged 21 commits into from
Mar 5, 2024
Merged

Plasma3 d #31

merged 21 commits into from
Mar 5, 2024

Conversation

wingena
Copy link
Collaborator

@wingena wingena commented Feb 23, 2024

Latest updates to plasma3D

…sing functions as standalone outside of class
…anch), but also centers[use] needed same fix
…a3Dmask was not correctly initialized for 2D runs. Reading input file operations have now moved before the main PFC loop.
…Q loading and traces; jan2024 update;

but no FEM yet
…OT in container still compiled with M3D-C1 support set to False
…lass; it's default value is set to False. toolsClass no longer overwrites already existing class variables with None at initialization, hence allowing to set defaults.
docker/Dockerfile Outdated Show resolved Hide resolved
@tloobyCFS
Copy link
Collaborator

nice. merging main into plasma3D was a good idea to fix the issues we saw

@plasmapotential
Copy link
Owner

@wingena this looks pretty good! I added a few minor comments throughout the code that should be addressed before we merge the branch into main. Generally they are just CI and workflow related comments.

Also, note that I added plasma3D to be the target for CI in this commit: 3373d46 . This means that when you push your code up to github it will automatically trigger the integration tests (only for NSTXU currently until I rebuild docker container with M3DC1 files for D3D as we discussed). You can see the status of the tests here on the PR page, or here.

Be sure to "pull" the plasma3D branch down to your machine to get my updates before you go through and edit things. Once you are done resolving each comment, mark it as resolved. When you are ready for me to review again, write a comment here or ping me via email and I will do the final merge into main.

@wingena
Copy link
Collaborator Author

wingena commented Mar 5, 2024

@plasmapotential I resolved the comments you made. The push triggered the test and passed.

Copy link
Owner

@plasmapotential plasmapotential left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approved plasma3D after comments were resolved

@plasmapotential plasmapotential merged commit 332d76e into main Mar 5, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants