Port to preCICE v2 and new OpenFOAM config

CHT/flow-over-plate/buoyantPimpleFoam-fenics/precice-config.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0"?>
+
+<precice-configuration>
+
+    <log>
+        <sink filter="%Severity% > debug and %Rank% = 0" format="---[precice] %ColorizedSeverity% %Message%" enabled="true"/>
+    </log>
+
+    <solver-interface dimensions="3">
+
+    <data:scalar name="Temperature"/>
+    <data:scalar name="Heat-Flux"/>
+
+    <mesh name="Fluid-Mesh">
+        <use-data name="Temperature"/>
+        <use-data name="Heat-Flux"/>
+    </mesh>
+
+    <mesh name="Solid-Mesh">
+        <use-data name="Temperature"/>
+        <use-data name="Heat-Flux"/>
+    </mesh>
+
+    <participant name="Fluid">
+        <use-mesh name="Fluid-Mesh" provide="yes"/>
+        <read-data name="Heat-Flux" mesh="Fluid-Mesh"/>
+        <write-data name="Temperature" mesh="Fluid-Mesh"/>
+    </participant>
+
+    <participant name="Solid">
+        <use-mesh name="Fluid-Mesh" from="Fluid"/>
+        <use-mesh name="Solid-Mesh" provide="yes"/>
+        <read-data name="Temperature" mesh="Solid-Mesh"/>
+        <write-data name="Heat-Flux" mesh="Solid-Mesh"/>
+        <mapping:nearest-neighbor direction="read" from="Fluid-Mesh" to="Solid-Mesh" constraint="consistent" timing="initial"/>
+        <mapping:nearest-neighbor direction="write" from="Solid-Mesh" to="Fluid-Mesh" constraint="consistent" timing="initial"/>
+    </participant>
+
+    <m2n:sockets from="Fluid" to="Solid"/>
+
+    <coupling-scheme:serial-implicit>
+        <time-window-size value="0.01"/>
+        <max-time value="1"/>
+        <max-iterations value="200"/>
+        <participants first="Fluid" second="Solid"/>
+        <exchange data="Temperature" mesh="Fluid-Mesh" from="Fluid" to="Solid"/>
+        <exchange data="Heat-Flux" mesh="Fluid-Mesh" from="Solid" to="Fluid"/>
+        <relative-convergence-measure limit="1.0e-6" data="Temperature" mesh="Fluid-Mesh"/>
+        <extrapolation-order value="0"/>
+        <acceleration:IQN-ILS>
+            <data mesh="Fluid-Mesh" name="Heat-Flux" />
+            <initial-relaxation value="0.01" />
+            <max-used-iterations value="80" />
+            <time-windows-reused value="10" />
+            <filter type="QR1" limit="1e-8" />
+        </acceleration:IQN-ILS>
+    </coupling-scheme:serial-implicit>
+
+    </solver-interface>
+
+</precice-configuration>

CHT/flow-over-plate/buoyantPimpleFoam-nutils/Nutils/cht.py

@@ -38,8 +38,7 @@ def main(elemsize: 'mesh width in x and y direction' = 0.05,
   participantName = "Nutils"
   solverProcessIndex = 0
   solverProcessSize = 1
-  interface = precice.Interface(participantName, solverProcessIndex, solverProcessSize)
-  interface.configure(configFileName)
+  interface = precice.Interface(participantName, configFileName, solverProcessIndex, solverProcessSize)
 
   # define coupling meshes
   meshNameGP = "Nutils-Mesh-GP" # Gauss points
@@ -51,12 +50,10 @@ def main(elemsize: 'mesh width in x and y direction' = 0.05,
   couplingsampleGP = couplinginterface.sample('gauss', degree=degree*2)
   couplingsampleCC = couplinginterface.sample('uniform', 4) # number of sub-samples for better mapping
 
-  verticesGP = couplingsampleGP.eval(ns.x).ravel()
-  verticesCC = couplingsampleCC.eval(ns.x).ravel()
-  dataIndicesGP = numpy.zeros(couplingsampleGP.npoints)
-  dataIndicesCC = numpy.zeros(couplingsampleCC.npoints)
-  interface.set_mesh_vertices(meshIDGP, couplingsampleGP.npoints, verticesGP, dataIndicesGP)
-  interface.set_mesh_vertices(meshIDCC, couplingsampleCC.npoints, verticesCC, dataIndicesCC)
+  verticesGP = couplingsampleGP.eval(ns.x)
+  verticesCC = couplingsampleCC.eval(ns.x)
+  dataIndicesGP = interface.set_mesh_vertices(meshIDGP, verticesGP)
+  dataIndicesCC = interface.set_mesh_vertices(meshIDCC, verticesCC)
 
   # coupling data
   writeData = "Heat-Flux"
@@ -89,8 +86,7 @@ def main(elemsize: 'mesh width in x and y direction' = 0.05,
 
     # read temperature from interface
     if interface.is_read_data_available():  
-      readdata = numpy.zeros(couplingsampleGP.npoints)
-      interface.read_block_scalar_data(readdataID, couplingsampleGP.npoints, dataIndicesGP, readdata)
+      readdata = interface.read_block_scalar_data(readdataID, dataIndicesGP)
       coupledata = couplingsampleGP.asfunction(readdata)
 
       sqr = couplingsampleGP.integral((ns.u - coupledata)**2)
@@ -99,7 +95,7 @@ def main(elemsize: 'mesh width in x and y direction' = 0.05,
     # save checkpoint
     if interface.is_action_required(precice.action_write_iteration_checkpoint()):
       lhscheckpoint = lhs0
-      interface.fulfilled_action(precice.action_write_iteration_checkpoint())
+      interface.mark_action_fulfilled(precice.action_write_iteration_checkpoint())
 
     # potentially adjust non-matching timestep sizes  
     dt = min(dt, precice_dt)  
@@ -111,14 +107,14 @@ def main(elemsize: 'mesh width in x and y direction' = 0.05,
     if interface.is_write_data_required(dt):
       fluxvalues = res.eval(lhs0=lhs0, lhs=lhs, dt=dt)
       writedata = couplingsampleCC.eval('-flux' @ ns, fluxdofs=fluxdofs(fluxvalues))
-      interface.write_block_scalar_data(writedataID, couplingsampleCC.npoints, dataIndicesCC, writedata)
+      interface.write_block_scalar_data(writedataID, dataIndicesCC, writedata)
 
     # do the coupling
     precice_dt = interface.advance(dt)
 
     # read checkpoint if required
     if interface.is_action_required(precice.action_read_iteration_checkpoint()):
-      interface.fulfilled_action(precice.action_read_iteration_checkpoint())
+      interface.mark_action_fulfilled(precice.action_read_iteration_checkpoint())
       lhs0 = lhscheckpoint
     else: # go to next timestep and visualize
       bezier = domain.sample('bezier', 2)

CHT/flow-over-plate/buoyantPimpleFoam-nutils/OpenFOAM/system/preciceDict

@@ -0,0 +1,33 @@
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      preciceDict;
+}
+
+preciceConfig "../precice-config.xml";
+
+participant OpenFOAM;
+
+modules (CHT);
+
+interfaces
+{
+  Interface1
+  {
+    mesh              OpenFOAM-Mesh;
+    patches           (interface);
+
+    readData
+    (
+      Heat-Flux
+    );
+
+    writeData
+    (
+      Temperature
+    );
+  };
+};

CHT/flow-over-plate/buoyantPimpleFoam-nutils/README.md

@@ -28,7 +28,7 @@ $ pip3 install mkl
 For running this tutorial, you further have to install
 
 * **preCICE**, see [preCICE wiki](https://github.com/precice/precice/wiki/Building).
-* **Python bindings**, see [bindings readme](https://github.com/precice/precice/tree/develop/src/precice/bindings/python)
+* **Python bindings**, see [bindings `README.md`](https://github.com/precice/precice/tree/develop/src/precice/bindings/python)
 * **OpenFOAM**, see [Notes on OpenFOAM](https://github.com/precice/openfoam-adapter/wiki/Notes-on-OpenFOAM).
 * **OpenFOAM adapter**, see [OpenFOAM adapter wiki](https://github.com/precice/openfoam-adapter/wiki/Building). If you have problems compiling, see the [troubleshooting section](https://github.com/precice/precice/wiki/CHT-with-OpenFOAM-and-FEniCS#troubleshooting) below.
 

CHT/flow-over-plate/buoyantPimpleFoam-nutils/precice-config.xml

@@ -3,7 +3,7 @@
 <precice-configuration>
 
   <log>
-    <sink filter= "%Severity% > debug" format="---[precice] %ColorizedSeverity% %Message%" enabled="true" />	
+    <sink filter= "%Severity% > debug and %Rank% = 0" format="---[precice] %ColorizedSeverity% %Message%" enabled="true" />	
   </log>
 
   <solver-interface dimensions="3">
@@ -40,20 +40,20 @@
     <write-data name="Heat-Flux" mesh="Nutils-Mesh-CC" />
   </participant>    
 
-  <m2n:sockets from="OpenFOAM" to="Nutils" exchange-directory=".." distribution-type="gather-scatter"/>
+  <m2n:sockets from="OpenFOAM" to="Nutils" exchange-directory=".."/>
 
   <coupling-scheme:serial-implicit>
-    <timestep-length value="0.01"/>
+    <time-window-size value="0.01"/>
     <max-time value="1"/>
     <max-iterations value="30"/>
     <participants first="OpenFOAM" second="Nutils"/>
     <exchange data="Temperature" mesh="OpenFOAM-Mesh" from="OpenFOAM" to="Nutils"/>
     <exchange data="Heat-Flux" mesh="OpenFOAM-Mesh" from="Nutils" to="OpenFOAM"/>
     <relative-convergence-measure limit="1.0e-5" data="Temperature" mesh="OpenFOAM-Mesh"/>
-    <post-processing:aitken>
+    <acceleration:aitken>
       <data mesh="OpenFOAM-Mesh" name="Heat-Flux" />
       <initial-relaxation value="0.01" />
-    </post-processing:aitken>
+    </acceleration:aitken>
   </coupling-scheme:serial-implicit>
 
   </solver-interface>

CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun

@@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then
     exit
 fi
 
-# Link to the precice-config for the serial run
-echo "Setting up the preCICE configuration file for a serial simulation"
-ln -s -f precice-config_serial.xml precice-config.xml
-
 # Participant 1: Inner-Fluid
 Participant1="Inner-Fluid"
 Solver1="buoyantSimpleFoam"

CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Allrun_parallel

@@ -11,10 +11,6 @@ if [ ! -f Solid/all.msh ]; then
     exit
 fi
 
-# Link to the precice-config for the parallel run
-echo "Setting up the preCICE configuration file for a parallel simulation"
-ln -s -f precice-config_parallel.xml precice-config.xml
-
 # Participant 1: inner-fluid
 Participant1="Inner-Fluid"
 Solver1="buoyantSimpleFoam"

CHT/heat_exchanger/buoyantSimpleFoam-CalculiX/Inner-Fluid/system/preciceDict

@@ -0,0 +1,35 @@
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      preciceDict;
+}
+
+preciceConfig "precice-config.xml";
+
+participant Inner-Fluid;
+
+modules (CHT);
+
+interfaces
+{
+  Interface1
+  {
+    mesh              Inner-Fluid-to-Solid;
+    patches           (interface);
+
+    readData
+    (
+      Sink-Temperature-Solid
+      Heat-Transfer-Coefficient-Solid
+    );
+
+    writeData
+    (
+      Sink-Temperature-Inner-Fluid
+      Heat-Transfer-Coefficient-Inner-Fluid
+    );
+  };
+};