Skip to content

Commit

Permalink
various fixes for feel++ code
Browse files Browse the repository at this point in the history
  • Loading branch information
prudhomm committed Jul 16, 2024
1 parent 04b6713 commit f5bce64
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 34 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ from feelpp.toolboxes.heat import * # <1>
import feelpp.toolboxes.core as core # <2>
from feelpp.operators import mass # <3>
import feelpp.mor as mor # <4>
import feelpp
import feelpp.core as fppc
----
<.> The toolbox heat is used to simulate the heat equation on the case studied.
<.> The module `core` is used to set the environment.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ We start by initializing the {feelpp} environment.
[%dynamic,python]
----
import sys
import feelpp
import feelpp.core as fppc
import feelpp.toolboxes.core as tb
from feelpp.toolboxes.cfpdes import *
import pandas as pd
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
[source,python]
.Electric
----
from feelpp import *
from feelpp.core import *
from feelpp.toolboxes.core import *
from feelpp.toolboxes.electric import *
----
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
[source,python]
.Fluid
----
from feelpp import *
from feelpp.core import *
from feelpp.toolboxes.core import *
from feelpp.toolboxes.fluid import *
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ The following example shows how to use the fluid toolbox in python:
We start with import feelpp, the heat toolboxes and start feelpp environment.
[source,python]
----
import feelpp
import feelpp.core as fppc
from feelpp.toolboxes.core import *
from feelpp.toolboxes.heat import *
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
"clean-build": "npm run clean-install;npm run build",
"clean-install": "rm -rf node_modules/ .cache/ package-lock.json ;npm i --cache=.cache/npm",
"dev": "npx antora site-dev.yml",
"version": "node_modules/.bin/antora --version",
"version": "npx antora --version",
"antora": "npx antora --stacktrace --fetch site.yml ",
"dev-serve": "node_modules/.bin/antora --stacktrace --fetch site-dev.yml ; node-srv -p 8010 build/site",
"dev-serve": "npx antora --stacktrace --fetch site-dev.yml ; node-srv -p 8010 build/site",
"start": "http-server build/site -d -i",
"serve": "node-srv -p 8011 build/site"
},
Expand Down
18 changes: 13 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
pyvista
xvfbwrapper
ipykernel
pyvista == 0.43.0
xvfbwrapper
ipykernel == 6.28.0
pythreejs
plotly
trame-vtk
trame
spdlog
trame
trame-vuetify
spdlog
ipywidgets == 8.1.2
jupyter-server-proxy
pandas < 2.2
nbmake >= 1.5
traitlets >= 5.10
tabulate
bottleneck >= 1.3.4
44 changes: 22 additions & 22 deletions site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ site:
google_analytics: 'UA-65761593-1'
content:
sources:
- url: https://github.com/feelpp/book.feelpp.org
branches: [develop]
- url: ./
branches: [HEAD]
start_path: docs/feelppdocs
tags:
- v0.110
- v0.109
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/user
tags:
- v0.110
Expand All @@ -23,8 +23,8 @@ content:
# - v0.107
# - v0.106
# - v0.105
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/dev
tags:
- v0.110
Expand All @@ -39,14 +39,14 @@ content:
- url: https://github.com/feelpp/feelpp-project
branches: master
start_path: docs/
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/data
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/math
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/toolboxes
tags:
- v0.110
Expand All @@ -56,19 +56,19 @@ content:
# - v0.106
# - v0.105
- url: https://github.com/feelpp/toolbox
branches: [develop]
branches: [HEAD]
tags:
- v0.110
- v0.109
- v0.110
- v0.109
start_path: examples
- url: https://github.com/feelpp/toolbox
branches: [develop]
branches: [HEAD]
start_path: toolboxes
- url: https://github.com/feelpp/toolbox
branches: develop
branches: HEAD
start_path: contribute
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/mor
tags:
- v0.110
Expand All @@ -79,10 +79,10 @@ content:
# - url: https://github.com/feelpp/book.hifimagnet
# branches: master
# start_path: docs/mso4sc
- url: https://github.com/feelpp/book.feelpp.org
branches: develop
- url: ./
branches: HEAD
start_path: docs/salome/
# - url: https://github.com/feelpp/book.feelpp.org
# - url: ./
# branches: mor-module
# start_path: docs/mor/
ui:
Expand Down

0 comments on commit f5bce64

Please sign in to comment.