From 89cb5b3f8c12b22e353069cb0c4bc86c176b3605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Simonis?= <simonisfrederic@gmail.com>
Date: Mon, 10 Feb 2020 10:19:11 +0100
Subject: [PATCH] Migrate to v2

---
 Preallocation_Timings/precice.xml.template |  2 +-
 RBF_Timings/precice.xml.template           |  2 +-
 contrib/precice.xml                        | 14 +++++++-------
 precice.xml                                |  2 +-
 src/preciceMap.cpp                         |  2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Preallocation_Timings/precice.xml.template b/Preallocation_Timings/precice.xml.template
index 95d0483d..46aaaa7b 100644
--- a/Preallocation_Timings/precice.xml.template
+++ b/Preallocation_Timings/precice.xml.template
@@ -22,7 +22,7 @@
       <use-data name="Data" />
     </mesh>
     
-    <m2n:sockets from="A" to="B" network="lo" exchange-directory=".."  distribution-type="point-to-point" />
+    <m2n:sockets from="A" to="B" network="lo" exchange-directory=".." />
 
     <participant name="A">
       <use-mesh name="MeshA" provide="yes" />
diff --git a/RBF_Timings/precice.xml.template b/RBF_Timings/precice.xml.template
index ceec5446..ff7114e4 100644
--- a/RBF_Timings/precice.xml.template
+++ b/RBF_Timings/precice.xml.template
@@ -22,7 +22,7 @@
       <use-data name="Data" />
     </mesh>
     
-    <m2n:sockets from="A" to="B" network="{network}" exchange-directory=".."  distribution-type="point-to-point" />
+    <m2n:sockets from="A" to="B" network="{network}" exchange-directory=".." />
 
     <participant name="A">
       <use-mesh name="MeshA" provide="yes" />
diff --git a/contrib/precice.xml b/contrib/precice.xml
index 6927b0a6..5614edf8 100644
--- a/contrib/precice.xml
+++ b/contrib/precice.xml
@@ -22,31 +22,31 @@
       <use-data name="Data" />
     </mesh>
     
-    <m2n:sockets from="A" to="B" network="lo" exchange-directory="."  distribution-type="point-to-point" />
+    <m2n:sockets from="A" to="B" network="lo" exchange-directory="." />
 
     <participant name="A">
       <use-mesh name="MeshA" provide="yes" />
       <write-data name="Data" mesh="MeshA" />
-      <master:mpi-single />
     </participant>
     
     <participant name="B">
       <use-mesh name="MeshA" provide="no" from="A" />
       <use-mesh name="MeshB" provide="yes" />
       <read-data name="Data" mesh="MeshB" />
+
       <mapping:nearest-neighbor constraint="consistent" direction="read" from="MeshA" to="MeshB" />
+      <!-- <mapping:nearest-projection constraint="consistent" direction="read" from="MeshA" to="MeshB" /> -->
       <!-- <mapping:rbf-gaussian shape-parameter="4" constraint="consistent" direction="read" from="MeshA" to="MeshB" x-dead="false" y-dead="false" z-dead="false" /> -->
-      <!-- <mapping:petrbf-gaussian shape-parameter="5600" solver-rtol="1e-9" constraint="consistent" direction="read" from="MeshA" to="MeshB" x-dead="true" y-dead="false" z-dead="false" polynomial="separate" preallocation="tree"/> -->
-      <!-- <mapping:petrbf-volume-splines solver-rtol="1e-9" constraint="consistent" direction="read" from="MeshA" to="MeshB" x-dead="false" y-dead="false" z-dead="false" /> -->
+      <!-- <mapping:rbf-gaussian shape-parameter="5600" solver-rtol="1e-9" constraint="consistent" direction="read" from="MeshA" to="MeshB" x-dead="true" y-dead="false" z-dead="false" polynomial="separate" preallocation="tree"/> -->
+      <!-- <mapping:rbf-volume-splines solver-rtol="1e-9" constraint="consistent" direction="read" from="MeshA" to="MeshB" x-dead="false" y-dead="false" z-dead="false" /> -->
       
-      <!-- <export:vtk timestep-interval="1" directory="vtkB/" normals="0"/> -->
-      <master:mpi-single />
+      <!-- <export:vtk every-n-time-windows="1" directory="vtkB/" normals="0"/> -->
     </participant>
     
     <coupling-scheme:parallel-explicit>
       <participants first="A" second="B" />
       <max-time value="1.0" />
-      <timestep-length value="1" />
+      <time-window-size value="1" />
       <exchange data="Data" mesh="MeshA" from="A" to="B" />
     </coupling-scheme:parallel-explicit>
     
diff --git a/precice.xml b/precice.xml
index 770347d5..8107db32 100644
--- a/precice.xml
+++ b/precice.xml
@@ -22,7 +22,7 @@
       <use-data name="Data" />
     </mesh>
     
-    <m2n:sockets from="A" to="B" network="lo" exchange-directory=".."  distribution-type="point-to-point" />
+    <m2n:sockets from="A" to="B" network="lo" exchange-directory=".." />
 
     <participant name="A">
       <use-mesh name="MeshA" provide="yes" />
diff --git a/src/preciceMap.cpp b/src/preciceMap.cpp
index e1044fe3..6d96fd34 100644
--- a/src/preciceMap.cpp
+++ b/src/preciceMap.cpp
@@ -247,7 +247,7 @@ int main(int argc, char* argv[])
         oss << mesh.data[i] << ' ';
     VLOG(1) << "Data written: " << oss.str();
 
-    interface.fulfilledAction(precice::constants::actionWriteInitialData());
+    interface.markActionFulfilled(precice::constants::actionWriteInitialData());
   }
   interface.initializeData();