Skip to content

Commit

Permalink
Merge pull request #133 from feelpp/132-bug-feelpp-project-fails-to-w…
Browse files Browse the repository at this point in the history
…ork-with-v111-releases

resolves 132: bug feelpp project fails to work with v111 releases
  • Loading branch information
prudhomm authored Jul 17, 2024
2 parents 49de0a1 + e609e8e commit d0fad44
Show file tree
Hide file tree
Showing 13 changed files with 593 additions and 136 deletions.
17 changes: 17 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
BasedOnStyle: LLVM

BreakBeforeBraces: Allman
AlignTrailingComments: true
IndentWidth: 4
UseTab: Never
AlignAfterOpenBracket: true
# Force pointers to the type for C++.
DerivePointerAlignment: false
PointerAlignment: Left
AllowShortFunctionsOnASingleLine: Inline
AllowShortIfStatementsOnASingleLine: true
NamespaceIndentation: None
ColumnLimit: 0
ReflowComments: true
SpacesInParentheses: true

4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
run: |
python3 -m venv .venv
source .venv/bin/activate
pip3 install -r requirements.txt
pip3 install -I -r requirements.txt
-
name: Compile
run: |
Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
run: |
python -m venv --system-site-packages .venv
source .venv/bin/activate
pip3 install -r requirements.txt
pip3 install -I -r requirements.txt
pip3 install dist/*.whl
tree .venv
- name: Build Antora Site
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ cmake_minimum_required(VERSION 3.21.0)

project(
feelpp-project
VERSION 3.0.1 )
VERSION 3.2.0 )

set(EXTRA_VERSION "")
set(PROJECT_SHORTNAME "fp")
Expand Down
6 changes: 3 additions & 3 deletions docs/modules/ROOT/pages/examples/fin.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -53,21 +53,21 @@ First, we initialize the {feelpp} environment and set the working directory.

[%dynamic,python]
----
import feelpp
import feelpp.core as fppc
from feelpp_project import laplacian
import json
import os
d = os.getcwd()
print(f"directory={d}")
e = feelpp.Environment(['fin'], config=feelpp.localRepository("."))
e = fppc.Environment(['fin'], config=fppc.localRepository("."))
----

Next, we set the configuration file for the simulation and load the specifications from a JSON file.

[%dynamic,python]
----
feelpp.Environment.setConfigFile(f"{d}/src/cases/laplacian/fin/fin1/fin2d.cfg")
fppc.Environment.setConfigFile(f"{d}/src/cases/laplacian/fin/fin1/fin2d.cfg")
# Reading the JSON file
data = laplacian.loadSpecs(f"{d}/src/cases/laplacian/fin/fin2d.json")
print(data)
Expand Down
Loading

0 comments on commit d0fad44

Please sign in to comment.