Skip to content

Commit e480aef

Browse files
fsimonisfsimonis
committed
Fix constness of SolverInterface
1 parent 28563fd commit e480aef

File tree

6 files changed

+78
-78
lines changed

6 files changed

+78
-78
lines changed

‎src/precice/SolverInterface.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -152,30 +152,30 @@ int SolverInterface:: getMeshVertexSize
152152

153153
void SolverInterface:: setMeshVertices
154154
(
155-
int meshID,
156-
int size,
157-
double* positions,
158-
int* ids )
155+
int meshID,
156+
int size,
157+
const double* positions,
158+
int* ids )
159159
{
160160
_impl->setMeshVertices(meshID, size, positions, ids);
161161
}
162162

163163
void SolverInterface:: getMeshVertices
164164
(
165-
int meshID,
166-
int size,
167-
int* ids,
168-
double* positions )
165+
int meshID,
166+
int size,
167+
const int* ids,
168+
double* positions )
169169
{
170170
_impl->getMeshVertices(meshID, size, ids, positions);
171171
}
172172

173173
void SolverInterface:: getMeshVertexIDsFromPositions
174174
(
175-
int meshID,
176-
int size,
177-
double* positions,
178-
int* ids )
175+
int meshID,
176+
int size,
177+
const double* positions,
178+
int* ids )
179179
{
180180
_impl->getMeshVertexIDsFromPositions(meshID, size, positions, ids);
181181
}
@@ -251,8 +251,8 @@ void SolverInterface:: writeBlockVectorData
251251
(
252252
int dataID,
253253
int size,
254-
int* valueIndices,
255-
double* values )
254+
const int* valueIndices,
255+
const double* values )
256256
{
257257
_impl->writeBlockVectorData(dataID, size, valueIndices, values);
258258
}
@@ -268,10 +268,10 @@ void SolverInterface:: writeVectorData
268268

269269
void SolverInterface:: writeBlockScalarData
270270
(
271-
int dataID,
272-
int size,
273-
int* valueIndices,
274-
double* values )
271+
int dataID,
272+
int size,
273+
const int* valueIndices,
274+
const double* values )
275275
{
276276
_impl->writeBlockScalarData(dataID, size, valueIndices, values);
277277
}
@@ -287,10 +287,10 @@ void SolverInterface:: writeScalarData
287287

288288
void SolverInterface:: readBlockVectorData
289289
(
290-
int dataID,
291-
int size,
292-
int* valueIndices,
293-
double* values )
290+
int dataID,
291+
int size,
292+
const int* valueIndices,
293+
double* values )
294294
{
295295
_impl->readBlockVectorData(dataID, size, valueIndices, values);
296296
}
@@ -306,10 +306,10 @@ void SolverInterface:: readVectorData
306306

307307
void SolverInterface:: readBlockScalarData
308308
(
309-
int dataID,
310-
int size,
311-
int* valueIndices,
312-
double* values )
309+
int dataID,
310+
int size,
311+
const int* valueIndices,
312+
double* values )
313313
{
314314
_impl->readBlockScalarData(dataID, size, valueIndices, values);
315315
}

‎src/precice/SolverInterface.hpp‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -403,10 +403,10 @@ class SolverInterface
403403
* @see getDimensions()
404404
*/
405405
void setMeshVertices (
406-
int meshID,
407-
int size,
408-
double* positions,
409-
int* ids );
406+
int meshID,
407+
int size,
408+
const double* positions,
409+
int* ids );
410410

411411
/**
412412
* @brief Get vertex positions for multiple vertex ids from a given mesh
@@ -424,10 +424,10 @@ class SolverInterface
424424
* @see getDimensions()
425425
*/
426426
void getMeshVertices (
427-
int meshID,
428-
int size,
429-
int* ids,
430-
double* positions );
427+
int meshID,
428+
int size,
429+
const int* ids,
430+
double* positions );
431431

432432
/**
433433
* @brief Gets mesh vertex IDs from positions.
@@ -445,10 +445,10 @@ class SolverInterface
445445
* @note prefer to reuse the IDs returned from calls to setMeshVertex() and setMeshVertices().
446446
*/
447447
void getMeshVertexIDsFromPositions (
448-
int meshID,
449-
int size,
450-
double* positions,
451-
int* ids );
448+
int meshID,
449+
int size,
450+
const double* positions,
451+
int* ids );
452452

453453
/**
454454
* @brief Sets mesh edge from vertex IDs, returns edge ID.
@@ -615,10 +615,10 @@ class SolverInterface
615615
* @see SolverInterface::setMeshVertex()
616616
*/
617617
void writeBlockVectorData (
618-
int dataID,
619-
int size,
620-
int* valueIndices,
621-
double* values );
618+
int dataID,
619+
int size,
620+
const int* valueIndices,
621+
const double* values );
622622

623623
/**
624624
* @brief Writes vector data to a vertex
@@ -663,10 +663,10 @@ class SolverInterface
663663
* @see SolverInterface::setMeshVertex()
664664
*/
665665
void writeBlockScalarData (
666-
int dataID,
667-
int size,
668-
int* valueIndices,
669-
double* values );
666+
int dataID,
667+
int size,
668+
const int* valueIndices,
669+
const double* values );
670670

671671
/**
672672
* @brief Writes scalar data to a vertex
@@ -710,10 +710,10 @@ class SolverInterface
710710
* @see SolverInterface::setMeshVertex()
711711
*/
712712
void readBlockVectorData (
713-
int dataID,
714-
int size,
715-
int* valueIndices,
716-
double* values );
713+
int dataID,
714+
int size,
715+
const int* valueIndices,
716+
double* values );
717717

718718
/**
719719
* @brief Reads vector data form a vertex
@@ -761,10 +761,10 @@ class SolverInterface
761761
* @see SolverInterface::setMeshVertex()
762762
*/
763763
void readBlockScalarData (
764-
int dataID,
765-
int size,
766-
int* valueIndices,
767-
double* values );
764+
int dataID,
765+
int size,
766+
const int* valueIndices,
767+
double* values );
768768

769769
/**
770770
* @brief Reads scalar data of a vertex.

‎src/precice/impl/RequestManager.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,9 +441,9 @@ void RequestManager:: requestWriteBlockScalarData (
441441

442442
void RequestManager:: requestWriteScalarData
443443
(
444-
int dataID,
445-
int valueIndex,
446-
const double& value )
444+
int dataID,
445+
int valueIndex,
446+
double value )
447447
{
448448
TRACE();
449449
_com->send(REQUEST_WRITE_SCALAR_DATA, 0);

‎src/precice/impl/RequestManager.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,9 @@ class RequestManager
124124

125125
/// Requests write scalar data from server.
126126
void requestWriteScalarData (
127-
int dataID,
128-
int valueIndex,
129-
const double& value );
127+
int dataID,
128+
int valueIndex,
129+
double value );
130130

131131
/// Requests write block vector data from server.
132132
void requestWriteBlockVectorData (

‎src/precice/impl/SolverInterfaceImpl.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1254,9 +1254,9 @@ void SolverInterfaceImpl:: writeBlockScalarData
12541254

12551255
void SolverInterfaceImpl:: writeScalarData
12561256
(
1257-
int fromDataID,
1258-
int valueIndex,
1259-
const double& value )
1257+
int fromDataID,
1258+
int valueIndex,
1259+
double value)
12601260
{
12611261
TRACE(fromDataID, valueIndex, value );
12621262
PRECICE_VALIDATE_DATA_ID(fromDataID);

‎src/precice/impl/SolverInterfaceImpl.hpp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,9 @@ class SolverInterfaceImpl : private boost::noncopyable
201201
/// Returns data id corresponding to the given name (from configuration) and mesh.
202202
int getDataID ( const std::string& dataName, int meshID );
203203

204+
/// Returns the number of nodes of a mesh.
205+
int getMeshVertexSize ( int meshID );
206+
204207
/**
205208
* @brief Resets mesh with given ID.
206209
*
@@ -210,6 +213,15 @@ class SolverInterfaceImpl : private boost::noncopyable
210213
*/
211214
void resetMesh ( int meshID );
212215

216+
/**
217+
* @brief Set the position of a solver mesh vertex.
218+
*
219+
* @return Vertex ID to be used when setting an edge.
220+
*/
221+
int setMeshVertex (
222+
int meshID,
223+
const double* position );
224+
213225
/**
214226
* @brief Sets several spatial positions for a mesh.
215227
*
@@ -246,18 +258,6 @@ class SolverInterfaceImpl : private boost::noncopyable
246258
const double* positions,
247259
int* ids );
248260

249-
/// Returns the number of nodes of a mesh.
250-
int getMeshVertexSize ( int meshID );
251-
252-
/**
253-
* @brief Set the position of a solver mesh vertex.
254-
*
255-
* @return Vertex ID to be used when setting an edge.
256-
*/
257-
int setMeshVertex (
258-
int meshID,
259-
const double* position );
260-
261261
/**
262262
* @brief Set an edge of a solver mesh.
263263
*
@@ -363,9 +363,9 @@ class SolverInterfaceImpl : private boost::noncopyable
363363
* @param dataValue [IN] Value of the data to be written
364364
*/
365365
void writeScalarData(
366-
int fromDataID,
367-
int valueIndex,
368-
const double& value );
366+
int fromDataID,
367+
int valueIndex,
368+
double value);
369369

370370
/**
371371
* @brief Reads vector data values given as block.

0 commit comments

Comments
 (0)