Merge pull request #23 from precice/develop

Update master (new documentation, bugfixes)

Author: IshaanDesai

README.md

@@ -1,9 +1,5 @@
 # preCICE-adapter for the CSM code Code_Aster
 
-This adapter was implemented as part of the [master thesis of Lucia Cheung](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). Currently only conjugate heat transfer is supported.
+This adapter was implemented as part of the [master thesis of Lucia Cheung](https://www5.in.tum.de/pub/Cheung2016_Thesis.pdf) in cooperation with [SimScale](https://www.simscale.com/). Currently only conjugate heat transfer is supported. Documentation is available in the `cht` subfolder, and [also here](https://www.precice.org/adapter-code_aster.html).
 
-The adapter currently supports preCICE v2.0 and Code_Aster v14.4. The following tutorials are available.
-
-* Flow over plate OpenFoam-Code_Aster ([wiki](https://github.com/precice/code_aster-adapter/wiki/Flow-over-plate-Code_Aster-Tutorial))
-
-A documentation is available in the `cht` subfolder, and in the [wiki](https://github.com/precice/code_aster-adapter/wiki).
+The adapter currently supports preCICE v2.2.0 and Code_Aster v14.6.

cht/adapter.py

@@ -116,14 +116,9 @@ def __init__(self, precice, participantName, names, MESH, SHMESH, MODEL, MAT, is
 		self.writeHCoeffDataID = 0
 		self.writeTempDataID = 0
 
-		self.readTemp = []
-		self.readHCoeff = []
 		self.writeTemp = []
 		self.writeHCoeff = []
 
-		self.readDataSize = 0
-		self.writeDataSize = 0
-
 		self.MESH = MESH
 		# Shifted mesh (contains only the interface, and is shifted by delta in the direction opposite to the normal)
 		self.SHMESH = SHMESH
@@ -147,8 +142,10 @@ def configure(self, names):
 
 		self.computeNormals()
 
+		dims = self.precice.get_dimensions()
+
 		self.nodeCoordinates = np.array([p for p in self.SHMESH.sdj.COORDO.VALE.get()])
-		self.nodeCoordinates = np.resize(self.nodeCoordinates, (int(len(self.nodeCoordinates)/3), 3))
+		self.nodeCoordinates = np.resize(self.nodeCoordinates, (int(len(self.nodeCoordinates)/dims), dims))
 		self.shiftMesh()
 
 		self.faces = [self.mesh.correspondance_mailles[idx] for idx in self.mesh.gma[self.groupName]]
@@ -158,12 +155,6 @@ def configure(self, names):
 
 		self.setDataIDs(names)
 
-		self.readDataSize = len(self.faces)
-		self.writeDataSize = len(self.nodeCoordinates)
-
-		self.readHCoeff = np.zeros(self.readDataSize)
-		self.readTemp = np.zeros(self.readDataSize)
-
 	def computeNormals(self):
 		# Get normals at the nodes
 		DUMMY = AFFE_MODELE(
@@ -181,7 +172,10 @@ def computeNormals(self):
 			OPERATION='NORMALE'
 		)
 		self.normals = N.EXTR_COMP().valeurs
-		self.normals = np.resize(np.array(self.normals), (int(len(self.normals)/3), 3))
+
+		dims = self.precice.get_dimensions()
+
+		self.normals = np.resize(np.array(self.normals), (int(len(self.normals)/dims), dims))
 		DETRUIRE(CONCEPT=({"NOM": N}, {"NOM": DUMMY}))
 
 	def setVertices(self):
@@ -251,9 +245,9 @@ def updateBCs(self, temp, hCoeff):
 					1)
 
 	def readAndUpdateBCs(self):
-		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)
+		readHCoeff = self.precice.read_block_scalar_data(self.readHCoeffDataID,  self.preciceFaceCenterIndices)
+		readTemp = self.precice.read_block_scalar_data(self.readTempDataID,  self.preciceFaceCenterIndices)
+		self.updateBCs(readTemp, readHCoeff)
 
 	def writeBCs(self, TEMP):
 		writeTemp, writeHCoeff = self.getBoundaryValues(TEMP)
@@ -277,10 +271,11 @@ def setLoad(self, LOAD):
 		self.LOAD = LOAD
 
 	def shiftMesh(self):
+		dims = self.precice.get_dimensions()
 		coords = [p for p in self.SHMESH.sdj.COORDO.VALE.get()]
 		for i in range(len(self.normals)):
-			for c in range(3):
-				coords[i*3 + c] = coords[i*3 + c] - self.normals[i][c] * self.delta
+			for c in range(dims):
+				coords[i*dims + c] = coords[i*dims + c] - self.normals[i][c] * self.delta
 		self.SHMESH.sdj.COORDO.VALE.changeJeveuxValues(len(coords), tuple(range(1, len(coords)+1)), tuple(coords), tuple(coords), 1)
 
 	def updateConductivity(self, T):