Commit 54faaab1 authored by Duggan, John's avatar Duggan, John
Browse files

Add initial output plots

parent 176c9de9

poetry.lock

+101 −1
Original line number Diff line number Diff line
@@ -304,6 +304,58 @@ files = [ 
    {file = "cfgv-3.4.0.tar.gz", hash = "sha256:e52591d4c5f5dead8e0f673fb16db7949d2cfb3f7da4582893288f0ded8fe560"},

]



[[package]]

name = "cftime"

version = "1.6.4.post1"

description = "Time-handling functionality from netcdf4-python"

optional = false

python-versions = ">=3.8"

groups = ["main"]

files = [

    {file = "cftime-1.6.4.post1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0baa9bc4850929da9f92c25329aa1f651e2d6f23e237504f337ee9e12a769f5d"},

    {file = "cftime-1.6.4.post1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:6bb6b087f4b2513c37670bccd457e2a666ca489c5f2aad6e2c0e94604dc1b5b9"},

    {file = "cftime-1.6.4.post1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:7d9bdeb9174962c9ca00015190bfd693de6b0ec3ec0b3dbc35c693a4f48efdcc"},

    {file = "cftime-1.6.4.post1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e735cfd544878eb94d0108ff5a093bd1a332dba90f979a31a357756d609a90d5"},

    {file = "cftime-1.6.4.post1-cp310-cp310-musllinux_1_2_x86_64.whl", hash = "sha256:1dcd1b140bf50da6775c56bd7ca179e84bd258b2f159b53eefd5c514b341f2bf"},

    {file = "cftime-1.6.4.post1-cp310-cp310-win_amd64.whl", hash = "sha256:e60b8f24b20753f7548f410f7510e28b941f336f84bd34e3cfd7874af6e70281"},

    {file = "cftime-1.6.4.post1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1bf7be0a0afc87628cb8c8483412aac6e48e83877004faa0936afb5bf8a877ba"},

    {file = "cftime-1.6.4.post1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:0f64ca83acc4e3029f737bf3a32530ffa1fbf53124f5bee70b47548bc58671a7"},

    {file = "cftime-1.6.4.post1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d7ebdfd81726b0cfb8b524309224fa952898dfa177c13d5f6af5b18cefbf497d"},

    {file = "cftime-1.6.4.post1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c9ea0965a4c87739aebd84fe8eed966e5809d10065eeffd35c99c274b6f8da15"},

    {file = "cftime-1.6.4.post1-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:800a18aea4e8cb2b206450397cb8a53b154798738af3cdd3c922ce1ca198b0e6"},

    {file = "cftime-1.6.4.post1-cp311-cp311-win_amd64.whl", hash = "sha256:5dcfc872f455db1f12eabe3c3ba98e93757cd60ed3526a53246e966ccde46c8a"},

    {file = "cftime-1.6.4.post1-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:a590f73506f4704ba5e154ef55bfbaed5e1b4ac170f3caeb8c58e4f2c619ee4e"},

    {file = "cftime-1.6.4.post1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:933cb10e1af4e362e77f513e3eb92b34a688729ddbf938bbdfa5ac20a7f44ba0"},

    {file = "cftime-1.6.4.post1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cf17a1b36f62e9e73c4c9363dd811e1bbf1170f5ac26d343fb26012ccf482908"},

    {file = "cftime-1.6.4.post1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8e18021f421aa26527bad8688c1acf0c85fa72730beb6efce969c316743294f2"},

    {file = "cftime-1.6.4.post1-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:5835b9d622f9304d1c23a35603a0f068739f428d902860f25e6e7e5a1b7cd8ea"},

    {file = "cftime-1.6.4.post1-cp312-cp312-win_amd64.whl", hash = "sha256:7f50bf0d1b664924aaee636eb2933746b942417d1f8b82ab6c1f6e8ba0da6885"},

    {file = "cftime-1.6.4.post1-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:5c89766ebf088c097832ea618c24ed5075331f0b7bf8e9c2d4144aefbf2f1850"},

    {file = "cftime-1.6.4.post1-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:7f27113f7ccd1ca32881fdcb9a4bec806a5f54ae621fc1c374f1171f3ed98ef2"},

    {file = "cftime-1.6.4.post1-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:da367b23eea7cf4df071c88e014a1600d6c5bbf22e3393a4af409903fa397e28"},

    {file = "cftime-1.6.4.post1-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6579c5c83cdf09d73aa94c7bc34925edd93c5f2c7dd28e074f568f7e376271a0"},

    {file = "cftime-1.6.4.post1-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:6b731c7133d17b479ca0c3c46a7a04f96197f0a4d753f4c2284c3ff0447279b4"},

    {file = "cftime-1.6.4.post1-cp313-cp313-win_amd64.whl", hash = "sha256:d2a8c223faea7f1248ab469cc0d7795dd46f2a423789038f439fee7190bae259"},

    {file = "cftime-1.6.4.post1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:9df3e2d49e548c62d1939e923800b08d2ab732d3ac8d75b857edd7982c878552"},

    {file = "cftime-1.6.4.post1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:2892b7e7654142d825655f60eb66c3e1af745901890316907071d44cf9a18d8a"},

    {file = "cftime-1.6.4.post1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a4ab54e6c04e68395d454cd4001188fc4ade2fe48035589ed65af80c4527ef08"},

    {file = "cftime-1.6.4.post1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:568b69fc52f406e361db62a4d7a219c6fb0ced138937144c3b3a511648dd6c50"},

    {file = "cftime-1.6.4.post1-cp38-cp38-win_amd64.whl", hash = "sha256:640911d2629f4a8f81f6bc0163a983b6b94f86d1007449b8cbfd926136cda253"},

    {file = "cftime-1.6.4.post1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:44e9f8052600803b55f8cb6bcac2be49405c21efa900ec77a9fb7f692db2f7a6"},

    {file = "cftime-1.6.4.post1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:a90b6ef4a3fc65322c212a2c99cec75d1886f1ebaf0ff6189f7b327566762222"},

    {file = "cftime-1.6.4.post1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:652700130dbcca3ae36dbb5b61ff360e62aa09fabcabc42ec521091a14389901"},

    {file = "cftime-1.6.4.post1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:24a7fb6cc541a027dab37fdeb695f8a2b21cd7d200be606f81b5abc38f2391e2"},

    {file = "cftime-1.6.4.post1-cp39-cp39-musllinux_1_2_x86_64.whl", hash = "sha256:fc2c0abe2dbd147e1b1e6d0f3de19a5ea8b04956acc204830fd8418066090989"},

    {file = "cftime-1.6.4.post1-cp39-cp39-win_amd64.whl", hash = "sha256:0ee2f5af8643aa1b47b7e388763a1a6e0dc05558cd2902cffb9cbcf954397648"},

    {file = "cftime-1.6.4.post1.tar.gz", hash = "sha256:50ac76cc9f10ab7bd46e44a71c51a6927051b499b4407df4f29ab13d741b942f"},

]



[package.dependencies]

numpy = [

    {version = ">1.13.3", markers = "python_version < \"3.12.0.rc1\""},

    {version = ">=1.26.0b1", markers = "python_version >= \"3.12.0.rc1\""},

]



[[package]]

name = "charset-normalizer"

version = "3.4.3"
@@ -1732,6 +1784,54 @@ files = [ 
fast = ["fastnumbers (>=2.0.0)"]

icu = ["PyICU (>=1.0.0)"]



[[package]]

name = "netcdf4"

version = "1.7.2"

description = "Provides an object-oriented python interface to the netCDF version 4 library"

optional = false

python-versions = ">=3.8"

groups = ["main"]

files = [

    {file = "netCDF4-1.7.2-cp310-cp310-macosx_12_0_x86_64.whl", hash = "sha256:5e9b485e3bd9294d25ff7dc9addefce42b3d23c1ee7e3627605277d159819392"},

    {file = "netCDF4-1.7.2-cp310-cp310-macosx_14_0_arm64.whl", hash = "sha256:118b476fd00d7e3ab9aa7771186d547da645ae3b49c0c7bdab866793ebf22f07"},

    {file = "netCDF4-1.7.2-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:abe5b1837ff209185ecfe50bd71884c866b3ee69691051833e410e57f177e059"},

    {file = "netCDF4-1.7.2-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:28021c7e886e5bccf9a8ce504c032d1d7f98d86f67495fb7cf2c9564eba04510"},

    {file = "netCDF4-1.7.2-cp310-cp310-win_amd64.whl", hash = "sha256:7460b638e41c8ce4179d082a81cb6456f0ce083d4d959f4d9e87a95cd86f64cb"},

    {file = "netCDF4-1.7.2-cp311-cp311-macosx_12_0_x86_64.whl", hash = "sha256:09d61c2ddb6011afb51e77ea0f25cd0bdc28887fb426ffbbc661d920f20c9749"},

    {file = "netCDF4-1.7.2-cp311-cp311-macosx_14_0_arm64.whl", hash = "sha256:fd2a16dbddeb8fa7cf48c37bfc1967290332f2862bb82f984eec2007bb120aeb"},

    {file = "netCDF4-1.7.2-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f54f5d39ffbcf1726a1e6fd90cb5fa74277ecea739a5fa0f424636d71beafe24"},

    {file = "netCDF4-1.7.2-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:902aa50d70f49d002d896212a171d344c38f7b8ca520837c56c922ac1535c4a3"},

    {file = "netCDF4-1.7.2-cp311-cp311-win_amd64.whl", hash = "sha256:3291f9ad0c98c49a4dd16aefad1a9abd3a1b884171db6c81bdcee94671cfabe3"},

    {file = "netCDF4-1.7.2-cp312-cp312-macosx_12_0_x86_64.whl", hash = "sha256:e73e3baa0b74afc414e53ff5095748fdbec7fb346eda351e567c23f2f0d247f1"},

    {file = "netCDF4-1.7.2-cp312-cp312-macosx_14_0_arm64.whl", hash = "sha256:a51da09258b31776f474c1d47e484fc7214914cdc59edf4cee789ba632184591"},

    {file = "netCDF4-1.7.2-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb95b11804fe051897d1f2044b05d82a1847bc2549631cdd2f655dde7de77a9c"},

    {file = "netCDF4-1.7.2-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f9d8a848373723f41ef662590b4f5e1832227501c9fd4513e8ad8da58c269977"},

    {file = "netCDF4-1.7.2-cp312-cp312-win_amd64.whl", hash = "sha256:568ea369e00b581302d77fc5fd0b8f78e520c7e08d0b5af5219ba51f3f1cd694"},

    {file = "netCDF4-1.7.2-cp313-cp313-macosx_12_0_x86_64.whl", hash = "sha256:205a5f1de3ddb993c7c97fb204a923a22408cc2e5facf08d75a8eb89b3e7e1a8"},

    {file = "netCDF4-1.7.2-cp313-cp313-macosx_14_0_arm64.whl", hash = "sha256:96653fc75057df196010818367c63ba6d7e9af603df0a7fe43fcdad3fe0e9e56"},

    {file = "netCDF4-1.7.2-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:30d20e56b9ba2c48884eb89c91b63e6c0612b4927881707e34402719153ef17f"},

    {file = "netCDF4-1.7.2-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d6bfd38ba0bde04d56f06c1554714a2ea9dab75811c89450dc3ec57a9d36b80"},

    {file = "netCDF4-1.7.2-cp313-cp313-win_amd64.whl", hash = "sha256:5c5fbee6134ee1246c397e1508e5297d825aa19221fdf3fa8dc9727ad824d7a5"},

    {file = "netCDF4-1.7.2-cp38-cp38-macosx_12_0_x86_64.whl", hash = "sha256:6bf402c2c7c063474576e5cf89af877d0b0cd097d9316d5bc4fcb22b62f12567"},

    {file = "netCDF4-1.7.2-cp38-cp38-macosx_14_0_arm64.whl", hash = "sha256:5bdf3b34e6fd4210e34fdc5d1a669a22c4863d96f8a20a3928366acae7b3cbbb"},

    {file = "netCDF4-1.7.2-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:657774404b9f78a5e4d26506ac9bfe106e4a37238282a70803cc7ce679c5a6cc"},

    {file = "netCDF4-1.7.2-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e896d92f01fbf365e33e2513d5a8c4cfe16ff406aae9b6034e5ba1538c8c7a8"},

    {file = "netCDF4-1.7.2-cp39-cp39-macosx_12_0_x86_64.whl", hash = "sha256:eb87c08d1700fe67c301898cf5ba3a3e1f8f2fbb417fcd0e2ac784846b60b058"},

    {file = "netCDF4-1.7.2-cp39-cp39-macosx_14_0_arm64.whl", hash = "sha256:59b403032774c723ee749d7f2135be311bad7d00d1db284bebfab58b9d5cdb92"},

    {file = "netCDF4-1.7.2-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:572f71459ef4b30e8554dcc4e1e6f55de515acc82a50968b48fe622244a64548"},

    {file = "netCDF4-1.7.2-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7f77e72281acc5f331f82271e5f7f014d46f5ca9bcaa5aafe3e46d66cee21320"},

    {file = "netCDF4-1.7.2-cp39-cp39-win_amd64.whl", hash = "sha256:d0fa7a9674fae8ae4877e813173c3ff7a6beee166b8730bdc847f517b282ed31"},

    {file = "netcdf4-1.7.2.tar.gz", hash = "sha256:a4c6375540b19989896136943abb6d44850ff6f1fa7d3f063253b1ad3f8b7fce"},

]



[package.dependencies]

certifi = "*"

cftime = "*"

numpy = "*"



[package.extras]

tests = ["Cython", "packaging", "pytest"]



[[package]]

name = "nodeenv"

version = "1.9.1"
@@ -3736,4 +3836,4 @@ propcache = ">=0.2.1" 
[metadata]

lock-version = "2.1"

python-versions = "^3.10"

content-hash = "980f8f05cc59dd45a8b06b52b58e6aecd5e2bf35f0c978e689bb2ea1e9792702"
 
content-hash = "c1ebadc0a3db45a33f1f525e4d52f3800194bba3f6fc11bbb761885a68e4fac4"

pyproject.toml

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ nova-trame = "*" 
trame-datagrid = ">=0.2.2"

trame-code = "^1.0.2"

nova-galaxy = "^0.11.1"

netcdf4 = "^1.7.2"





[build-system]

src/ips_fastran_gui/app/models/plot.json

0 → 100644
+52 −0
Original line number Diff line number Diff line 
{

    "yrange": {

        "density": [0, 30.0],

        "temperature": [0, 30.0],

        "rotation": [0, 10.0e3],

        "heating": [0, 1.0],

        "current": [0, 2.5],

        "pressure": [0, 300.0e3],

        "q": [0, 10.0],

        "fluxe": [0, 300.0],

        "fluxi": [0, 300.0]

    },

    "pannel": {

        "nrows": 2,

        "ncols": 4

    },

    "define": {

        "density": [

            ["ne", 0, "k--"],

            ["ne", -1, "k"]

        ],

        "temperature": [

            ["te", -1, "r"  ],

            ["ti", -1, "b"  ],

            ["te",  0, "r--"],

            ["ti",  0, "b--"]

        ],

        "rotation": [

            ["omega", -1, "k"  ],

            ["omega",  0, "k--"]

        ],

        "heating": [

            ["pi_nb", -1, "k"],

            ["pi_rf", -1, "b"],

            ["pe_rf", -1, "r"]

        ],

        "current": [

            ["j_tot", -1, "k"],

            ["j_rf", -1, "r"],

            ["j_nb", -1, "g"]

        ],

        "q": [

            ["q", -1, "k"]

        ],

        "fluxe": [

            ["fluxe_exp", -1, "k"]

        ],

        "fluxi": [

            ["fluxi_exp", -1, "k"]

        ]

    }

}

src/ips_fastran_gui/app/models/plotter.py

0 → 100644
+59 −0
Original line number Diff line number Diff line 
"""Fastran Plotter."""



import json

import os

from pathlib import Path



# default plot preferences

import matplotlib

import netCDF4

from matplotlib.figure import Figure



matplotlib.rcParams["axes.linewidth"] = 0.5

matplotlib.rc("pdf", fonttype=42)

matplotlib.rcParams["figure.max_open_warning"] = 0





class PlotFastran:

    """Fastran Plotter."""



    def __init__(self, figure: Figure) -> None:

        self.figure = figure

        with open(Path(os.path.dirname(__file__)) / "plot.json") as plot_json:

            self.input_params = json.load(plot_json)



    def load_fastran(self, fn_ncfile: Path) -> None:

        self.fastran = netCDF4.Dataset(fn_ncfile, "r", format="NETCDF4")

        self.basename = os.path.basename(fn_ncfile)



    def set_page(self, txt: str = "") -> None:

        nrows = self.input_params["pannel"]["nrows"]

        ncols = self.input_params["pannel"]["ncols"]

        self.ax = self.figure.subplots(nrows=nrows, ncols=ncols)



        plot_list = list(self.input_params["define"])

        if len(plot_list) is not nrows * ncols:

            raise Exception("Number of pannel != nrows * ncols")



        k_plot = 0

        for i_plot in range(nrows):

            for j_plot in range(ncols):

                pannel = plot_list[k_plot]

                define = self.input_params["define"][pannel]

                p = self.ax[i_plot, j_plot]

                for key in define:

                    print(pannel, key)

                    x = self.fastran.variables["rho"][:]

                    y = self.fastran.variables[key[0]][key[1], :]

                    p.plot(x, y, key[2])



                p.set_title(pannel)

                p.set_xlim(0, 1)

                if pannel in self.input_params["yrange"]:

                    yrange = self.input_params["yrange"][pannel]

                    print("set plot range", pannel, yrange)

                    p.set_ylim(yrange[0], yrange[1])

                else:

                    print("default plot range", pannel)



                k_plot += 1

src/ips_fastran_gui/app/view_models/main_view_model.py

+8 −4
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ from nova.mvvm.interface import BindingInterface 
from pydantic import BaseModel, Field, ValidationError



from ..models.main_model import MainModel

from ..models.plotter import PlotFastran





class ViewState(BaseModel):
@@ -27,8 +28,8 @@ class MainViewModel: 
        self.model = model

        self.view_state = ViewState()



        # TODO: scale the figures based on the window size

        self.figure = Figure(figsize=(8.0, 4.0))

        self.ax = self.figure.subplots(1, 1)



        # here we create a bind that connects ViewModel with View. It returns a communicator object,

        # that allows to update View from ViewModel (by calling update_view).
@@ -79,7 +80,7 @@ class MainViewModel: 
            pass



    def on_completion(self, _sender: Any, output_path: Path) -> None:

        self.update_figure()

        self.update_figure(output_path)



        self.view_state.results_disabled = False

        self.view_state_bind.update_in_view(self.view_state)
@@ -90,6 +91,9 @@ class MainViewModel: 
            self.view_state.active_tab = 2

            self.view_state_bind.update_in_view(self.view_state)



    def update_figure(self) -> None:

        # TODO: draw the rest of the owl

    def update_figure(self, output_path: Path) -> None:

        plotter = PlotFastran(self.figure)

        plotter.load_fastran(output_path)

        plotter.set_page()



        self.figure_bind.update_in_view(None)