Merge pull request #18 from precice/chenghui62000-tutorial-addition

Upgrade Code-Aster Adapter for preCICE 2.0

Author: micheltakken

cht/adapter.py

@@ -21,8 +21,7 @@ def __init__(self, preciceConfigFile, participantName, config, MESH, MODEL, MAT,
 		self.isNonLinear = isNonLinear
 		self.participantName = participantName
 		self.preciceDt = -1
-		self.precice = precice.Interface(participantName, 0, 1)
-		self.precice.configure(preciceConfigFile)
+		self.precice = precice.Interface(participantName, preciceConfigFile, 0, 1)
 		self.configure(config)
 
 	def configure(self, config):
@@ -74,7 +73,7 @@ def readCheckpoint(self):
 			self.precice.fulfilled_action(precice.action_read_iteration_checkpoint())
 
 	def isCouplingTimestepComplete(self):
-		return self.precice.is_timestep_complete()
+		return self.precice.is_time_window_complete()
 
 	def advance(self):
 		self.preciceDt = self.precice.advance(self.preciceDt)
@@ -187,13 +186,11 @@ def computeNormals(self):
 
 	def setVertices(self):
 		# Nodes
-		self.preciceNodeIndices = [0] * len(self.nodeCoordinates)
 		self.preciceNodesMeshID = self.precice.get_mesh_id(self.nodesMeshName)
-		self.precice.set_mesh_vertices(self.preciceNodesMeshID, len(self.nodeCoordinates), np.hstack(self.nodeCoordinates), self.preciceNodeIndices)
+		self.preciceNodeIndices = self.precice.set_mesh_vertices(self.preciceNodesMeshID,  self.nodeCoordinates)
 		# Face centers
-		self.preciceFaceCenterIndices = [0] * len(self.faceCenterCoordinates)
 		self.preciceFaceCentersMeshID = self.precice.get_mesh_id(self.faceCentersMeshName)
-		self.precice.set_mesh_vertices(self.preciceFaceCentersMeshID, len(self.faceCenterCoordinates), np.hstack(self.faceCenterCoordinates), self.preciceFaceCenterIndices)
+		self.preciceFaceCenterIndices = self.precice.set_mesh_vertices(self.preciceFaceCentersMeshID, self.faceCenterCoordinates)
 
 	def setDataIDs(self, names):
 		for writeDataName in names["write-data"]:
@@ -254,14 +251,14 @@ def updateBCs(self, temp, hCoeff):
 					1)
 
 	def readAndUpdateBCs(self):
-		self.precice.read_block_scalar_data(self.readHCoeffDataID, self.readDataSize, self.preciceFaceCenterIndices, self.readHCoeff)
-		self.precice.read_block_scalar_data(self.readTempDataID, self.readDataSize, self.preciceFaceCenterIndices, self.readTemp)
+		self.precice.read_block_scalar_data(self.readHCoeffDataID,  self.preciceFaceCenterIndices)
+		self.precice.read_block_scalar_data(self.readTempDataID,  self.preciceFaceCenterIndices)
 		self.updateBCs(self.readTemp, self.readHCoeff)
 
 	def writeBCs(self, TEMP):
 		writeTemp, writeHCoeff = self.getBoundaryValues(TEMP)
-		self.precice.write_block_scalar_data(self.writeHCoeffDataID, self.writeDataSize, self.preciceNodeIndices, writeHCoeff)
-		self.precice.write_block_scalar_data(self.writeTempDataID, self.writeDataSize, self.preciceNodeIndices, writeTemp)
+		self.precice.write_block_scalar_data(self.writeHCoeffDataID, self.preciceNodeIndices, writeHCoeff)
+		self.precice.write_block_scalar_data(self.writeTempDataID,  self.preciceNodeIndices, writeTemp)
 
 	def getBoundaryValues(self, T):
 

tutorials/buoyantSimpleFoam-aster/fluid/precice-adapter-config.yml

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

tutorials/buoyantSimpleFoam-aster/fluid/system/preciceDict

@@ -43,8 +43,8 @@
     </participant>
     <m2n:sockets to="Fluid" from="Solid" exchange-directory="/home/michel/Desktop/Code_Aster-Adapter-Dummy/buoyantSimpleFoam-aster" distribution-type="gather-scatter"/>
     <coupling-scheme:serial-explicit>
-      <timestep-length value="1"/>
-      <max-time value="100"/>
+      <time-window-size value="1"/>
+      <max-time-windows value="100"/>
       <participants first="Solid" second="Fluid"/>
       <exchange data="Sink-Temperature-Solid" mesh="Solid-Interface-Nodes" from="Solid" to="Fluid"/>
       <exchange data="Heat-Transfer-Coefficient-Solid" mesh="Solid-Interface-Nodes" from="Solid" to="Fluid"/>