Merge branch 'develop' into update-setupmatlab-to-v2

Author: BenjaminRodenberg

+precice/@Participant/Participant.m

@@ -247,7 +247,6 @@ function writeData(obj,meshName,dataName,valueIndices,values)
             end
             inSize = length(valueIndices);
             values = preciceGateway(uint8(61),meshName,dataName,int32(inSize),valueIndices,relativeReadTime);
-            values = reshape(values,obj.getDataDimensions(meshName,dataName),[]);
         end
 
         % requiresGradientDataFor

+precice/@Participant/private/preciceGateway.cpp

@@ -304,7 +304,8 @@ class MexFunction: public matlab::mex::Function {
                 const TypedArray<double> relativeReadTime = inputs[5];
                 std::vector<double> values(size[0]*dim);
                 interface->readData(meshName,dataName,vertexIDs,relativeReadTime[0],values);
-                outputs[0] = factory.createArray<double>({1, size[0]*dim}, values.data(), values.data()+values.size());
+                assert(values.size() == dim*vertexIDs.size());
+                outputs[0] = factory.createArray<double>({dim, vertexIDs.size()}, values.data(), values.data()+values.size());
                 break;
             }
             case FunctionID::requiresGradientDataFor:
@@ -339,8 +340,8 @@ class MexFunction: public matlab::mex::Function {
                 size_t dim = interface->getMeshDimensions(meshName);
                 std::vector <double> positions(size[0]*dim);
                 interface->getMeshVertexIDsAndCoordinates(meshName,ids,positions);
-                outputs[0] = factory.createArray<int32_t>({size[0]}, ids.data(), ids.data()+ids.size());
-                outputs[1] = factory.createArray<double>({size[0], dim}, positions.data(), positions.data()+positions.size());
+                outputs[0] = factory.createArray<int32_t>({1, ids.size()}, ids.data(), ids.data()+ids.size());
+                outputs[1] = factory.createArray<double>({dim, ids.size()}, positions.data(), positions.data()+positions.size());
                 break;
             } 
 

README.md

@@ -47,13 +47,18 @@ The function syntax is mostly identical to the syntax of the C++ API. The follow
 As an example, the C++ API function
 
 ```bash
-readData(int dataID, int size, const int *valueIndices, double *values)
+void readData(
+    ::precice::string_view          meshName, 
+    ::precice::string_view          dataName, 
+    ::precice::span<const VertexID> ids,
+    double                          relativeReadTime, 
+    ::precice::span<double>         values) const
 ```
 
 is found in the MATLAB bindings as
 
 ```bash
-values = readData(dataID, valueIndices)
+values = readData(meshName, dataName, ids, relativeReadTime)
 ```
 
 ## Out of process variant