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

Plasma evolution with feedforward coils #719

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
48f4c57
FRESCO instead of Solovev
orso82 Sep 13, 2024
dbd3e13
switch_get_from with default
orso82 Sep 13, 2024
ee6c65e
fresco p',ff' from p,j and previous eqt
orso82 Sep 13, 2024
0be21dd
bug fix
orso82 Sep 13, 2024
816c913
remove unecessary ip_from
orso82 Sep 15, 2024
98afcb8
fix show of pf_active
orso82 Sep 15, 2024
5056f17
expose more FRESCO parameters
orso82 Sep 15, 2024
929db27
Use properly computed Ip_non_inductive in ActorQED
bclyons12 Sep 24, 2024
adafa39
Require QED v1.4 for coil evolution
bclyons12 Sep 25, 2024
5f1234b
Merge branch 'master' into fresco
bclyons12 Sep 25, 2024
8ae2b5a
Add FRESCO back to Makefile
bclyons12 Sep 25, 2024
63b983b
Merge branch 'fresco' into feedforward
bclyons12 Sep 25, 2024
86c38bb
WIP: Create ActorPlasmaBuild
bclyons12 Sep 26, 2024
90e5214
Rename to ActorQEDcoupled
bclyons12 Sep 26, 2024
86609c7
Bug fixes
bclyons12 Sep 26, 2024
6084934
Expose ActorQEDcoupled in ActorCurrent
bclyons12 Sep 26, 2024
be4a03d
Merge branch 'master' into feedforward
bclyons12 Sep 26, 2024
338b9c0
Fix conventions in from_TokSys
bclyons12 Sep 29, 2024
570c9cb
Write FRESCO ff', f, and p to dd in finalize
bclyons12 Sep 29, 2024
435a061
Equilibrium hack: initialize from pp' and FF' in pulse_schedule
bclyons12 Sep 29, 2024
a891abb
QEDcoupled: use coil voltages from pulse_schedule
bclyons12 Sep 29, 2024
6d3c174
Merge remote-tracking branch 'origin/master' into feedforward
orso82 Sep 30, 2024
6f04b57
from_TokSys without retime!
orso82 Sep 30, 2024
b17afc2
Merge branch 'master' into feedforward
bclyons12 Sep 30, 2024
1927765
Merge branch 'master' into feedforward
bclyons12 Oct 1, 2024
97cffcb
Merge branch 'master' into feedforward
bclyons12 Oct 3, 2024
88801e7
Merge branch 'master' into feedforward
bclyons12 Oct 3, 2024
243feb8
Merge branch 'master' into feedforward
bclyons12 Oct 14, 2024
cdb4119
Merge branch 'master' into feedforward
bclyons12 Oct 15, 2024
d9395c1
Merge branch 'master' into feedforward
bclyons12 Oct 16, 2024
4b9df56
Merge branch 'master' into feedforward
bclyons12 Oct 16, 2024
5de02c0
Merge branch 'master' into feedforward
bclyons12 Oct 17, 2024
beb21e0
Merge branch 'master' into feedforward
bclyons12 Oct 21, 2024
8f68fef
Merge branch 'master' into feedforward
bclyons12 Oct 24, 2024
42a86a9
Merge branch 'master' into feedforward
bclyons12 Oct 29, 2024
cf3fff1
Merge branch 'master' into feedforward
bclyons12 Oct 30, 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
Prev Previous commit
Next Next commit
Merge branch 'master' into feedforward
  • Loading branch information
bclyons12 committed Oct 3, 2024
commit 97cffcb81a05b1aed76799aabfa02245106301d7
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ else
endif

GENERAL_REGISTRY_PACKAGES := CoordinateConventions FuseExchangeProtocol MillerExtendedHarmonic IMASdd
FUSE_PACKAGES_MAKEFILE := ADAS BoundaryPlasmaModels CHEASE CoordinateConventions EPEDNN FiniteElementHermite Fortran90Namelists FRESCO FuseUtils FusionMaterials FuseExchangeProtocol IMAS IMASdd MXHEquilibrium MeshTools MillerExtendedHarmonic NEO NNeutronics QED RABBIT SimulationParameters TEQUILA TGLFNN TJLF VacuumFields XSteam ThermalSystemModels
FUSE_PACKAGES_MAKEFILE := ADAS BalanceOfPlantSurrogate BoundaryPlasmaModels CHEASE CoordinateConventions EPEDNN FiniteElementHermite FRESCO FuseUtils FusionMaterials FuseExchangeProtocol IMAS IMASdd MXHEquilibrium MeshTools MillerExtendedHarmonic NEO NNeutronics QED RABBIT SimulationParameters TEQUILA TGLFNN TJLF VacuumFields ThermalSystemModels # XSteam Fortran90Namelists
FUSE_PACKAGES_MAKEFILE := $(sort $(FUSE_PACKAGES_MAKEFILE))
FUSE_PACKAGES := $(shell echo '$(FUSE_PACKAGES_MAKEFILE)' | awk '{printf("[\"%s\"", $$1); for (i=2; i<=NF; i++) printf(", \"%s\"", $$i); print "]"}')
DEV_PACKAGES_MAKEFILE := $(shell find ../*/.git/config -exec grep ProjectTorreyPines \{\} /dev/null \; | cut -d'/' -f 2)
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.