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
36 stars 11 forks source link

Issue 1217 plot ploc plotting - [merged] #2242

Closed jonmaddock closed 1 year ago

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Jan 12, 2021, 16:03

Merges issue-1217-plot-ploc-plotting -> develop

This issue updates the vertical build output to show full output for double null and fixes plot_proc issues arising in #1183 and #1217

jonmaddock commented 3 years ago

In GitLab by @mkovari on Jan 13, 2021, 14:22

Can you confirm that the vertical build works correctly now for SND and DND, both in OUT.DAT and in the diagram?

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Jan 13, 2021, 14:59

An example of the Single null vertical build

 *********************************************** Vertical Build ***********************************************

 Single null case
                                          Thickness (m)    Height (m)
 TF coil                                      1.400           9.128   (tfcth)             
 Gap                                          0.050           7.728   (tftsgap)           
 Thermal shield                               0.050           7.678   (thshield)          
 Gap                                          0.050           7.628   (vgap2)             
 Vacuum vessel (and shielding)                0.600           7.578   (d_vv_top+shldtth)  
 Gap                                          0.020           6.978   (vvblgap)           
 Top blanket                                  0.869           6.958   (blnktth)           
 Top first wall                               0.018           6.089   (fwtth)             
 Top scrape-off                               0.600           6.071   (vgaptop)           
 Plasma top                                   5.471           5.471   (rminor*kappa)      
 Midplane                                     0.000           0.000                       
 Plasma bottom                                5.471          -5.471   (rminor*kappa)      
 Lower scrape-off                             2.002          -7.474   (vgap)              
 Divertor structure                           0.621          -8.095   (divfix)            
 Vacuum vessel (and shielding)                1.000          -9.095   (d_vv_bot+shldlth)  
 Gap                                          0.050          -9.145   (vgap2)             
 Thermal shield                               0.050          -9.195   (thshield)          
 Gap                                          0.050          -9.245   (tftsgap)           
 TF coil                                      1.400         -10.645   (tfcth)             

I've just checked the double null vertical build and there are some formatting errors. I'll just correct them to push once more.

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Jan 13, 2021, 15:48

added 1 commit

Compare with previous version

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Jan 13, 2021, 15:49

Here is an example for double null

 *********************************************** Vertical Build ***********************************************

 Double null case
                                          Thickness (m)    Height (m)
 TF coil                                      0.324           7.233   (tfcth)             
 Gap                                          0.005           6.909   (tftsgap)           
 Thermal shield                               0.020           6.904   (thshield)          
 Gap                                          0.500           6.884   (vgap2)             
 Vacuum vessel (and shielding)                0.670           6.384   (d_vv_top+shldtth)  
 Divertor structure                           1.227           5.714   (divfix)            
 Top scrape-off                               0.600           4.487   (vgaptop)           
 Plasma top                                   3.887           3.887   (rminor*kappa)      
 Midplane                                     0.000           0.000                       
 Plasma bottom                                3.887          -3.887   (rminor*kappa)      
 Lower scrape-off                             0.000          -3.887   (vgap)              
 Divertor structure                           1.227          -5.114   (divfix)            
 Vacuum vessel (and shielding)                0.900          -6.014   (d_vv_bot+shldlth)  
 Gap                                          0.500          -6.514   (vgap2)             
 Thermal shield                               0.020          -6.534   (thshield)          
 Gap                                          0.005          -6.539   (tftsgap)           
 TF coil                                      0.324          -6.863   (tfcth)      

I've pushed the updates to this branch, so it is now ready to merge.

jonmaddock commented 3 years ago

@ajpearcey I will help with this merge, as getting the pipeline to pass involves overwriting the regression references. I am working on making this easier with two tools (#1239 and #1242). It may be best to wait for these tools to be working in order to make this merge easier. If this merge is urgent, I can do this manually.

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Feb 23, 2021, 10:05

added 92 commits

Compare with previous version

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Feb 23, 2021, 10:47

added 1 commit

Compare with previous version

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Feb 23, 2021, 13:28

added 1 commit

Compare with previous version

jonmaddock commented 3 years ago

In GitLab by @ajpearcey on Feb 23, 2021, 13:58

added 1 commit

Compare with previous version

jonmaddock commented 3 years ago

In GitLab by @stuartmuldrew on Feb 25, 2021, 10:07

merged

jonmaddock commented 3 years ago

In GitLab by @stuartmuldrew on Feb 25, 2021, 10:07

mentioned in commit 8586efbad124dd0c0442cc418a4559cfdd3fa115