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

V4.0 #23

Merged
merged 79 commits into from
Dec 28, 2023
Merged

V4.0 #23

merged 79 commits into from
Dec 28, 2023

Conversation

plasmapotential
Copy link
Owner

@plasmapotential plasmapotential commented Dec 28, 2023

Combines filaments, plasma3D, cfsMachine, tophat fluxes, and random small bug fixes. Includes M3DC1-io libs, and MAFOT compiled with M3DC1 support. Introduces CI in the form of integration tests triggered by push.

plasmapotential and others added 30 commits March 17, 2023 18:50
gFile naming modified to make it work, but that needs further revision
requires MAFOT version 5.5 or higher to read arbitrary gFile names
3D plasmas can be turned on by flag in main input file -> moved the flag to live in plasma3D class
some bug fixes
3D plasma run ready for first test.
…ns. By coincidence the bug only affected D3D and MAST runs.
add clean up for log files
add handling of failed points
fix psiN only calculations
Structured the screen output better, just print statements added and moved
…a3D class; fix heat flux scaling for layer model
@plasmapotential
Copy link
Owner Author

@wingena FYI. I merged your latest commits from last week into the v4.0 branch, then merged v4.0 into main. There is a new docker container that is compatible, called v4.0. m3dc1-io libs/bins/include should be in here, and I recompiled MAFOT with M3DC1 support. Please checkout main after i merge, download the new container, and see if you find any bugs. I will merge now and you we can iterate if necessary.

one other comment - the only thing i had to change when merging the plasma3D branch is the name of two variables ("Pinj" -> "P" and "coreRadFrac" -> "radFrac") as the new names better describe the variables. This was done for the heatFluxClass, so it affects you.

self.HFS = None # True: use high field side SOL, False: use low field side SOL
self.teProfileData = None
self.neProfileData = None
self.allowed_vars = ['Lcmin', 'lcfs', 'lqCN', 'S', 'P', 'radFrac', 'qBG',
Copy link
Owner Author

Choose a reason for hiding this comment

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

@wingena see how I had to change Pinj to P and coreRadFrac to radFrac to keep this code consistent with the rest of the code base and input files.

Copy link
Owner Author

@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.

reviewed and approved

@plasmapotential plasmapotential merged commit 89fb102 into main Dec 28, 2023
1 check passed
@tloobyCFS tloobyCFS deleted the v4.0 branch May 21, 2024 10:19
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.

2 participants