Merge branch 'ITHACA-FV:master' into tutorial_parallelization

Author: Ruansh233

.compileOF2412.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+docker pull ithacafv/openfoam2412-muq2-pytorch
+docker run -ti -d --name foam2412 -v "${PWD}":/home/ofuser/app:rw ithacafv/openfoam2412-muq2-pytorch /bin/bash
+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"

.compileOF2506.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+docker pull ithacafv/openfoam2506-muq2-pytorch
+docker run -ti -d --name foam2506 -v "${PWD}":/home/ofuser/app:rw ithacafv/openfoam2506-muq2-pytorch /bin/bash
+docker exec foam2506 /bin/bash -c "source /usr/lib/openfoam/openfoam2506/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"

.github/workflows/of2412.yml

@@ -0,0 +1,27 @@
+name: OF2412
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        include:
+          - name: "OpenFOAM 2412"
+            install: "cd ."
+            compile: ./.compileOF2412.sh
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: install OF
+      run: ${{ matrix.install}}
+    - name: make
+      run: ${{ matrix.compile}}

.github/workflows/of2512.yml

@@ -0,0 +1,27 @@
+name: OF2506
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    
+    strategy:
+      matrix:
+        include:
+          - name: "OpenFOAM 2506"
+            install: "cd ."
+            compile: ./.compileOF2506.sh
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v1
+    - name: install OF
+      run: ${{ matrix.install}}
+    - name: make
+      run: ${{ matrix.compile}}

.gitmodules

@@ -5,3 +5,9 @@
 [submodule "src/thirdparty/Eigen"]
 	path = src/thirdparty/Eigen
 	url = https://gitlab.com/libeigen/eigen.git
+[submodule "src/thirdparty/spectra"]
+	path = src/thirdparty/spectra
+	url = https://github.com/yixuan/spectra.git
+[submodule "src/thirdparty/OptimLib"]
+	path = src/thirdparty/OptimLib
+	url = https://github.com/kthohr/optim.git

README.md

@@ -14,18 +14,15 @@
 <img alt="Codacy Badge" src="https://app.codacy.com/project/badge/Grade/f51e1de0fd7c42a6a0be13889cbd4b0e">
 </a>
 </p>
-<p align="center">
-<a href="https://github.com/ithaca-fv/ITHACA-FV/actions?query=workflow%3AOF1812"><img alt="OF1812" src="https://github.com/ithaca-fv/ITHACA-FV/workflows/OF2212/badge.svg"></a>
-</p>
 
 ### 0. Introduction
 **ITHACA-FV** is an implementation in **OpenFOAM** of several reduced order modelling techniques. **ITHACA-FV** is designed for [**OpenFOAM v2412**](https://www.openfoam.com/news/main-news/openfoam-v2412/) but it can be easily adapted also to other versions of OpenFOAM.
 
 **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.
 
-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.
+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.
 
-**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.
+**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, OpenFOAM 2412 and OpenFOAM 2506.
 
 ### 1. Prerequisites
 **ITHACA-FV** requires
@@ -35,12 +32,13 @@ Linear and non-linear algebra operations which are not already implemented in Op
 *   [**OpenFOAM 2312**](https://www.openfoam.com/news/main-news/openfoam-v2312) or
 *   [**OpenFOAM 2406**](https://www.openfoam.com/news/main-news/openfoam-v2406) or
 *   [**OpenFOAM 2412**](https://www.openfoam.com/news/main-news/openfoam-v2412) or
+*   [**OpenFOAM 2506**](https://www.openfoam.com/news/main-news/openfoam-v2506)
 
 
 ### 2. Installation and usage
 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
 ```
-source $HOME/OpenFOAM/OpenFOAM-v2106/etc/bashrc
+source $HOME/OpenFOAM/OpenFOAM-v2506/etc/bashrc
 ```
 Then navigate to the folder where you want to install ITHACA-FV such as, for example, your HOME folder
 ```
@@ -75,8 +73,9 @@ source etc/bashrc
 
 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:
 ```
-    curl https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.4.0%2Bcpu.zip > libtorch.zip && \
-    unzip libtorch.zip -d opt/ && \
+    wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.7.1%2Bcpu.zip > libtorch.zip && \
+    unzip libtorch.zip && \
+    export TORCH_LIBRARIES=libtorch
 ```
 
 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).

applications/POD/Make/options

@@ -34,7 +34,7 @@ EXE_INC = \
     -I$(LIB_ITHACA_SRC)/thirdparty/spectra/include \
     -Wno-comment \
     -w \
-    -std=c++14
+    -std=c++17
 
 EXE_LIBS = \
     -lturbulenceModels \

applications/extract_time_evolution/Make/options

@@ -25,7 +25,7 @@ EXE_INC = \
     -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
     -I$(LIB_SRC)/functionObjects/forces/lnInclude \
     -w \
-    -std=c++14
+    -std=c++17
 
 EXE_LIBS = \
     -lturbulenceModels \

dockerfiles/OF2412/Dockerfile

@@ -0,0 +1,31 @@
+# Start from the ubuntu Openfoam 2106 image
+FROM opencfd/openfoam-dev:2412
+USER root
+ARG PYTHON_VERSION=3.7
+ENV PATH="/root/miniconda3/bin:${PATH}"
+
+RUN rm /etc/apt/sources.list.d/openfoam.list && \
+    cp /etc/apt/sources.list /etc/apt/sources.list.backup && \
+    grep -v -e "openfoam" /etc/apt/sources.list.backup > /etc/apt/sources.list && \
+    echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections && \
+    apt-get update && \
+    apt-get install -yy -q pwgen npm nodejs cmake git wget bzip2 unzip && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+
+# Anaconda installing
+RUN wget https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh && \
+bash Miniconda3-latest-Linux-x86_64.sh -b && \
+rm Miniconda3-latest-Linux-x86_64.sh && \
+. /root/miniconda3/etc/profile.d/conda.sh && \  
+export PATH=/root/miniconda3/bin:$PATH && \
+wget https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-2.7.1%2Bcpu.zip && \
+unzip libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
+rm libtorch-cxx11-abi-shared-with-deps-2.7.1+cpu.zip && \
+conda tos accept --override-channels --channel https://repo.anaconda.com/pkgs/main && \
+conda tos accept --override-channels --channel  https://repo.anaconda.com/pkgs/r && \
+conda install -y -c conda-forge muq cmake pybind11 && \
+conda clean -y --all
+ENV TORCH_LIBRARIES=/libtorch
+ENV MUQ_LIBRARIES=/root/miniconda3
+RUN echo 'source /usr/lib/openfoam/openfoam2412/etc/bashrc' >> ~/.bashrc 
+

dockerfiles/OF2412/Makefile

@@ -0,0 +1,9 @@
+ME=$(shell whoami)
+clean:
+	rm -f hello
+
+build:
+	docker build -t ithacafv/openfoam2412-muq2-pytorch -f ./Dockerfile .
+
+run: 
+	docker run -it ithacafv/openfoam2412-muq2-pytorch bash