Skip to content

Commit d0fad44

Browse files
authored
Merge pull request #133 from feelpp/132-bug-feelpp-project-fails-to-work-with-v111-releases
resolves 132: bug feelpp project fails to work with v111 releases
2 parents 49de0a1 + e609e8e commit d0fad44

File tree

13 files changed

+593
-136
lines changed

13 files changed

+593
-136
lines changed

.clang-format

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
BasedOnStyle: LLVM
2+
3+
BreakBeforeBraces: Allman
4+
AlignTrailingComments: true
5+
IndentWidth: 4
6+
UseTab: Never
7+
AlignAfterOpenBracket: true
8+
# Force pointers to the type for C++.
9+
DerivePointerAlignment: false
10+
PointerAlignment: Left
11+
AllowShortFunctionsOnASingleLine: Inline
12+
AllowShortIfStatementsOnASingleLine: true
13+
NamespaceIndentation: None
14+
ColumnLimit: 0
15+
ReflowComments: true
16+
SpacesInParentheses: true
17+

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
run: |
2727
python3 -m venv .venv
2828
source .venv/bin/activate
29-
pip3 install -r requirements.txt
29+
pip3 install -I -r requirements.txt
3030
-
3131
name: Compile
3232
run: |
@@ -67,7 +67,7 @@ jobs:
6767
run: |
6868
python -m venv --system-site-packages .venv
6969
source .venv/bin/activate
70-
pip3 install -r requirements.txt
70+
pip3 install -I -r requirements.txt
7171
pip3 install dist/*.whl
7272
tree .venv
7373
- name: Build Antora Site

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ cmake_minimum_required(VERSION 3.21.0)
2525

2626
project(
2727
feelpp-project
28-
VERSION 3.0.1 )
28+
VERSION 3.2.0 )
2929

3030
set(EXTRA_VERSION "")
3131
set(PROJECT_SHORTNAME "fp")

docs/modules/ROOT/pages/examples/fin.adoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,21 +53,21 @@ First, we initialize the {feelpp} environment and set the working directory.
5353

5454
[%dynamic,python]
5555
----
56-
import feelpp
56+
import feelpp.core as fppc
5757
from feelpp_project import laplacian
5858
import json
5959
import os
6060
6161
d = os.getcwd()
6262
print(f"directory={d}")
63-
e = feelpp.Environment(['fin'], config=feelpp.localRepository("."))
63+
e = fppc.Environment(['fin'], config=fppc.localRepository("."))
6464
----
6565

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

6868
[%dynamic,python]
6969
----
70-
feelpp.Environment.setConfigFile(f"{d}/src/cases/laplacian/fin/fin1/fin2d.cfg")
70+
fppc.Environment.setConfigFile(f"{d}/src/cases/laplacian/fin/fin1/fin2d.cfg")
7171
# Reading the JSON file
7272
data = laplacian.loadSpecs(f"{d}/src/cases/laplacian/fin/fin2d.json")
7373
print(data)

0 commit comments

Comments
 (0)