Skip to content

Commit 4357262

Browse files
committed
update documentation generation, bump version to 0.3.0
1 parent 3539986 commit 4357262

File tree

9 files changed

+46
-248
lines changed

9 files changed

+46
-248
lines changed

README.rst

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@ Functionality examples
2727
* GUI is experimental,
2828
* reluctance module is currently working for a single optimization example and not fully implemented yet.
2929

30-
1. Detailed Documentation
30+
Detailed Documentation
3131
-------------------------
3232

3333
Can be found
3434
`here <https://upb-lea.github.io/FEM_Magnetics_Toolbox/main/intro.html>`__.
3535

36-
2. Installation
36+
Installation
3737
---------------
3838

39-
2.1 ONELAB installation
39+
ONELAB installation
4040
~~~~~~~~~~~~~~~~~~~~~~~
4141

4242
- Go to https://onelab.info/
4343
- Download the Desktop Version for your OS (Windows, Linux or macOS)
4444
- Unpack the software and remember the file path. This will be needed
4545
later when installing FEMMT.
4646

47-
2.2 Install FEMMT
47+
Install FEMMT
4848
~~~~~~~~~~~~~~~~~
4949

5050
Chose to install the development version of FEMMT or the release
@@ -73,21 +73,21 @@ Also have a look at the . `developers notes </developers_notes.md>`__.
7373
git clone git@github.com:upb-lea/FEM_Magnetics_Toolbox.git
7474
pip install -e .
7575

76-
2.3 Minimal example and first run
76+
Minimal example and first run
7777
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
7878

7979
Run the example from here:
8080
`basic_example.py </femmt/examples/basic_example.py>`__. FEMMT will ask
8181
you for the installation path of ONELAB during first use.
8282

83-
3. Examples
83+
Examples
8484
-----------
8585

8686
This toolbox is able to build a complete FEM simulation from simple
8787
Python code. The following figure shows the Python code on the left and
8888
the corresponding FEM simulation on the right. |image1|
8989

90-
3.1 Basics
90+
Basics
9191
~~~~~~~~~~
9292

9393
Code examples can be found in this `example
@@ -125,15 +125,15 @@ In it you can find
125125
For more information about the possible winding types, please
126126
have a look `here <winding_overview.md>`__.
127127

128-
3.2 Counting arrow system
128+
Counting arrow system
129129
~~~~~~~~~~~~~~~~~~~~~~~~~
130130

131131
Defined as depicted here:
132132

133133
|image3|
134134

135-
4. GUI
136-
------
135+
GUI (Experimental)
136+
-------------------
137137

138138
There is a first preview for a GUI. Installing this is a bit cumbersome
139139
at first, but will be simplified in the future:
@@ -146,37 +146,37 @@ Please note, the GUI is experimental.
146146

147147
|image2|
148148

149-
5. Roadmap
149+
Roadmap
150150
----------
151151

152152
Planned features in 2022:
153153

154154
* Software stability and general improvements,
155155
* add more Functionality to the GUI,
156156

157-
6. Bug Reports
157+
Bug Reports
158158
--------------
159159

160160
Please use the issues report button within github to report bugs.
161161

162-
7. Contributing
162+
Contributing
163163
---------------
164164

165165
Pull requests are welcome. For major changes, please open an issue first
166166
to discuss what you would like to change. For contributing, please refer
167167
to this `section <Contributing.rst>`__.
168168

169-
8. Changelog
169+
Changelog
170170
------------
171171

172172
Find the changelog `here <CHANGELOG.md>`__
173173

174-
9. License
174+
License
175175
----------
176176

177177
`GPLv3 <https://choosealicense.com/licenses/gpl-3.0/>`__
178178

179-
10. History and project status
179+
History and project status
180180
------------------------------
181181

182182
This project was initially written in matlab using FEMM simulation tool.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
"Documentation": "https://upb-lea.github.io/FEM_Magnetics_Toolbox/main/intro.html",
6262
"Source Code": "https://github.com/upb-lea/FEM_Magnetics_Toolbox",
6363
},
64-
version='0.2.1',
64+
version='0.3.0',
6565
zip_safe=False,
6666
data_files=[('', ['CHANGELOG.md'])]
6767
)

sphinx/source/conf.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
author = 'LEA-UPB'
2424

2525
# The full version, including alpha/beta/rc tags
26-
release = '0.2.1'
26+
release = '0.3.0'
2727

2828
# -- General configuration ---------------------------------------------------
2929

@@ -66,9 +66,6 @@
6666
'collapse_navigation': False,
6767
}
6868

69-
# replace "view page source" with "edit on github" in Read The Docs theme
70-
# * https://github.com/readthedocs/sphinx_rtd_theme/issues/529
71-
7269
html_context = {
7370
'display_github': True,
7471
'github_user': 'upb-lea',

sphinx/source/femmt.rst

Lines changed: 0 additions & 29 deletions
This file was deleted.

sphinx/source/index.rst

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,15 @@
1-
.. FEM Magnetics Toolbox documentation master file, created by
2-
sphinx-quickstart on Fri Oct 15 16:52:09 2021.
3-
You can adapt this file completely to your liking, but it should at least
4-
contain the root `toctree` directive.
5-
61
Welcome to FEM Magnetics Toolbox's documentation!
7-
=================================================
2+
"""""""""""""""""""""""""""""""""""""""""""""""""""""
83

94
.. toctree::
105
:maxdepth: 6
11-
:caption: Contents:
6+
:caption: Table of Contents:
127

138
intro
14-
femmt
15-
16-
179

1810

1911
Indices and tables
20-
==================
12+
"""""""""""""""""""""""""""""""""""""""""""""""""""""
2113

2214
* :ref:`genindex`
23-
* :ref:`modindex`
24-
* :ref:`search`
15+

sphinx/source/install.rst

Lines changed: 0 additions & 47 deletions
This file was deleted.

sphinx/source/intro.rst

Lines changed: 24 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,34 @@
11
.. sectnum::
22

3-
************
4-
Introduction
5-
************
6-
==============================
7-
FEM Magnetics Toolbox (FEMMT)
8-
==============================
9-
Python toolbox to generate preconfigured figures for FEM simulation tools in power electronics.
103

11-
The toolbox contains two parts, a reluctance module and a FEM module.
12-
* The reluctance module is for pre-calculations
13-
* The FEM module is for detailed calculations
4+
.. include:: ../../README.rst
145

15-
The toolbox is accessible via python code or a graphical user interface (GUI), which current development status is experimental.
166

17-
.. image:: ../../documentation/femmt.png
18-
:width: 300px
19-
:align: center
20-
:alt: femmt overview
7+
Function and class documentation
8+
==================================
9+
The ``MagneticComponent`` class
10+
----------------------------------
2111

22-
Functionality examples
23-
* work with pre-defined standard core structures
24-
* work with pre-defined litz wires
25-
* use python to perform parametersweeps, e.g. perform several automated simulations of different air gap sizes
26-
* read the results automated with python from the FEM simulation tool
12+
.. currentmodule:: femmt.femmt_classes
2713

28-
.. note::
29-
Development status: Alpha
30-
* GUI is experimental,
31-
* reluctance module is currently working for a single optimization example and not fully implemented yet.
14+
.. autoclass:: MagneticComponent
15+
:members:
16+
:undoc-members:
17+
:special-members: __init__
18+
:member-order: bysource
3219

33-
.. include:: install.rst
20+
FEMMT functions
21+
---------------------------------
3422

35-
.. include:: usage.rst
23+
.. automodule:: femmt.femmt_functions
24+
:members:
25+
:undoc-members:
26+
27+
FEMMT Thermal
28+
-------------------------
3629

37-
.. include:: others.rst
30+
.. currentmodule:: femmt.thermal.thermal_classes
31+
32+
.. autoclass:: ConstraintPro
33+
:members:
34+
:undoc-members:

sphinx/source/others.rst

Lines changed: 0 additions & 38 deletions
This file was deleted.

0 commit comments

Comments
 (0)