Skip to content

Commit 3303742

Browse files
authored
Merge pull request ITHACA-FV#611 from giovastabile/update_submodules
FIX: updating readme, added action for OF2412, switched some tutorials to stdc++17
2 parents 09becd9 + 4e8c12c commit 3303742

4 files changed

Lines changed: 9 additions & 8 deletions

File tree

.compileOF2412.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22
docker pull ithacafv/openfoam2412-muq2-pytorch
33
docker run -ti -d --name foam2412 -v "${PWD}":/home/ofuser/app:rw ithacafv/openfoam2412-muq2-pytorch /bin/bash
4-
docker exec foam2412 /bin/bash -c "source /usr/lib/openfoam/openfoam2412/etc/bashrc; cd /home/ofuser/app; source etc/bashrc; git submodule update --init; ./Allwmake -taumq"
4+
docker exec foam2412 /bin/bash -c "source /usr/lib/openfoam/openfoam2412/etc/bashrc; cd /home/ofuser/app; git config --global --add safe.directory /home/ofuser/app; source etc/bashrc; git submodule update --init; ./Allwclean; ./Allwmake -taumq"

README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@
2323

2424
**ITHACA-FV** can also be used as a basis for more advanced projects that would like to assess the capability of reduced order models in their existing **OpenFOAM**-based software, thanks to the availability of several reduced order methods and algorithms.
2525

26-
Linear and non-linear algebra operations which are not already implemented in OpenFOAM are performed with the external library [**Eigen**](http://eigen.tuxfamily.org/index.php?title=Main_Page). The source code of Eigen 3.3.7 is provided together with ITHACA-FV and is located in the [src/thirdyparty/Eigen](./src/thirdparty/Eigen) folder. For the EigenValue decomposition it is also possible to rely on the [**Spectra-0.7.0**](https://spectralib.org/) library and the source code is provided in the [src/thirdyparty/spectra](./src//thirdparty/spectra) folder. Numerical optimization can be performed using the external library [**OptimLib**](https://www.kthohr.com/optimlib.html) and the header based source code is provided in the [src/thirdyparty/OptimLib](./src/thirdparty/OptimLib) folder.
26+
Linear and non-linear algebra operations which are not already implemented in OpenFOAM are performed with the external library [**Eigen**](http://eigen.tuxfamily.org/index.php?title=Main_Page). Eigen 3.4 is provided as a git submodule together with ITHACA-FV and is located in the [src/thirdyparty/Eigen](./src/thirdparty/Eigen) folder. For the EigenValue decomposition it is also possible to rely on the [**Spectra-1.2.0**](https://spectralib.org/) library and the source code, as a git submodule, is provided in the [src/thirdyparty/spectra](./src//thirdparty/spectra) folder. Numerical optimization can be performed using the external library [**OptimLib**](https://www.kthohr.com/optimlib.html) and the header based source code, as a git submodule, is provided in the [src/thirdyparty/OptimLib](./src/thirdparty/OptimLib) folder.
2727

28-
**ITHACA-FV** has been tested on ubuntu 16.04, CentOS 7, ArchLinux but can be easily compiled on any linux distribution with a compiled version of OpenFOAM 2106, OpenFOAM 2212, OpenFOAM 2306, OpenFOAM 2312, OpenFOAM 2406, and OpenFOAM 2412.
28+
**ITHACA-FV** has been tested on several versions of ubuntu, CentOS 7, ArchLinux but can be easily compiled on any linux distribution with a compiled version of OpenFOAM 2106, OpenFOAM 2212, OpenFOAM 2306, OpenFOAM 2312, OpenFOAM 2406, and OpenFOAM 2412.
2929

3030
### 1. Prerequisites
3131
**ITHACA-FV** requires
@@ -40,7 +40,7 @@ Linear and non-linear algebra operations which are not already implemented in Op
4040
### 2. Installation and usage
4141
First of all you need to source the bashrc file of your installation **OpenFOAM**. This is of course depending on the location of your OpenFOAM installation and of your particular version of OpenFOAM
4242
```
43-
source $HOME/OpenFOAM/OpenFOAM-v2106/etc/bashrc
43+
source $HOME/OpenFOAM/OpenFOAM-v2412/etc/bashrc
4444
```
4545
Then navigate to the folder where you want to install ITHACA-FV such as, for example, your HOME folder
4646
```
@@ -75,8 +75,9 @@ source etc/bashrc
7575

7676
In the near future the ITHACA-FV will also be linked with the pytorch package for machine learning. Some basic functions are already available. In order to compile these additional functionalities one will need to have torch installed and compile the library with the `-m` options. Moreover one will need to install a version of libtorch with ABI enabled. The one available at the following link for example has it:
7777
```
78-
curl https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.4.0%2Bcpu.zip > libtorch.zip && \
79-
unzip libtorch.zip -d opt/ && \
78+
wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.7.1%2Bcpu.zip > libtorch.zip && \
79+
unzip libtorch.zip && \
80+
export TORCH_LIBRARIES=libtorch
8081
```
8182

8283
For a brief description of the classes and methods, you can check the official ITHACA-FV doxygen [documentation](https://ithaca-fv.github.io/ITHACA-FV).

tutorials/UQ/01enKF/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EXE_INC = \
1616
-I$(MUQ_EXT_LIBRARIES)/include\
1717
-DOFVER=$${WM_PROJECT_VERSION%.*} \
1818
-Wno-comment \
19-
-std=c++11 \
19+
-std=c++17 \
2020
-Wno-maybe-uninitialized \
2121
-Wno-sign-compare \
2222
-Wno-unknown-pragmas \

tutorials/UQ/02enKF_1DinverseHeatTransfer/Make/options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ EXE_INC = \
1717
-DOFVER=$${WM_PROJECT_VERSION%.*} \
1818
-Wno-comment \
1919
-g \
20-
-std=c++11 \
20+
-std=c++17 \
2121
-Wno-maybe-uninitialized \
2222
-Wno-sign-compare \
2323
-Wno-unknown-pragmas \

0 commit comments

Comments
 (0)