search

ukaea / PROCESS

PROCESS is a systems code at UKAEA that calculates in a self-consistent manner the parameters of a fusion power plant with a specified performance, ensuring that its operating limits are not violated, and with the option to optimise to a given function of these parameters.
https://ukaea.github.io/PROCESS/
MIT License
35 stars 11 forks source link

Fixed #3150 (winding pack current density constraint) #3160

Closed mkovari closed 3 months ago

mkovari commented 5 months ago

Fixed #3150.
Removed obsolete references to PROCESS Users's Guide.

mkovari commented 5 months ago

The image files plot_proc_1, 2 and 3 must have been put into the examples folder automatically when I ran pytest. Because there were so many modified files I used git commit -a, and because I didn't have the examples folder open in VSCode I didn't see they had been changed.

However, they seem to fit, and since only the new third page is shown in the changes tab, I suppose that the other two pages, plot_proc_1.png and plot_proc_2.png were already there, so I have left plot_proc_3.png there.

mkovari commented 5 months ago

I have corrected indentations in several files.

mkovari commented 4 months ago

The plot_proc figures have nothing to do with this pull request. They result from Chris's edit. If the example notebook needs changing it should be done there. I will delete the unwanted png.

mkovari commented 4 months ago

Unwanted png removed. Rebased.

mkovari commented 4 months ago

I have fixed the conflict localy, but when I rebased and then tried to force push, I couldn't do it:

(env) mkovari@J1714:~/PROCESS$ git push --force
ssh: connect to host github.com port 22: Connection timed out
fatal: Could not read from remote repository.

Please make sure you have the correct access rights
and the repository exists.