Skip to content

Commit ebd5ecb

Browse files
committed
unimplemented code fix
1 parent 9e94aab commit ebd5ecb

File tree

2 files changed

+26
-12
lines changed

2 files changed

+26
-12
lines changed

src/pmpo_c.cpp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,10 @@ void polympo_deleteMPMesh_f(MPMesh_ptr p_mpmesh) {
5353
}
5454

5555
void polympo_setMPICommunicator_f(MPMesh_ptr p_mpmesh, MPI_Fint fcomm){
56-
MPI_Comm comm = MPI_Comm_f2c(fcomm);
57-
auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
58-
p_MPs->setMPIComm(comm);
56+
checkMPMeshValid(p_mpmesh);
57+
MPI_Comm comm = MPI_Comm_f2c(fcomm);
58+
auto p_MPs = ((polyMPO::MPMesh*)p_mpmesh)->p_MPs;
59+
p_MPs->setMPIComm(comm);
5960
}
6061

6162
void polympo_createMPs_f(MPMesh_ptr p_mpmesh,
@@ -453,18 +454,27 @@ void polympo_setMPStrainRate_f(MPMesh_ptr p_mpmesh, const int nComps, const int
453454
p_MPs->parallel_for(setMPStrainRate, "setMPStrainRate");
454455
}
455456
void polympo_getMPStrainRate_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStrainRateHost){
457+
checkMPMeshValid(p_mpmesh);
458+
std::cerr << "Error: This routine is not implemented yet\n";
459+
exit(1);
456460
(void)p_mpmesh;
457461
(void)nComps;
458462
(void)numMPs;
459463
(void)mpStrainRateHost;
460464
}
461465
void polympo_setMPStress_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, const double* mpStressIn){
466+
checkMPMeshValid(p_mpmesh);
467+
std::cerr << "Error: This routine is not implemented yet\n";
468+
exit(1);
462469
(void)p_mpmesh;
463470
(void)nComps;
464471
(void)numMPs;
465472
(void)mpStressIn;
466473
}
467474
void polympo_getMPStress_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStressHost){
475+
checkMPMeshValid(p_mpmesh);
476+
std::cerr << "Error: This routine is not implemented yet\n";
477+
exit(1);
468478
(void)p_mpmesh;
469479
(void)nComps;
470480
(void)numMPs;
@@ -949,12 +959,16 @@ void polympo_setReconstructionOfVel_f(MPMesh_ptr p_mpmesh, const int order, cons
949959

950960
void polympo_setReconstructionOfStrainRate_f(MPMesh_ptr p_mpmesh, const int order, const int meshEntType){
951961
checkMPMeshValid(p_mpmesh);
962+
std::cerr << "Error: This routine is not implemented yet\n";
963+
exit(1);
952964
(void)order;
953965
(void)meshEntType;
954966
}
955967

956968
void polympo_setReconstructionOfStress_f(MPMesh_ptr p_mpmesh, const int order, const int meshEntType){
957969
checkMPMeshValid(p_mpmesh);
970+
std::cerr << "Error: This routine is not implemented yet\n";
971+
exit(1);
958972
(void)order;
959973
(void)meshEntType;
960974
}

test/testFortranMPAdvection.f90

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -117,17 +117,17 @@ subroutine runReconstructionTest(mpMesh, numMPs, numPush, nCells, nVertices, mp2
117117
call polympo_setReconstructionOfMass(mpMesh,0,polympo_getMeshFVtxType())
118118
call polympo_setReconstructionOfVel(mpMesh,0,polympo_getMeshFVtxType())
119119
call polympo_push(mpMesh)
120-
! call polympo_getMeshElmMass(mpMesh,nCells,c_loc(meshElmMass))
121-
! call polympo_getMeshVtxMass(mpMesh,nVertices,c_loc(meshVtxMass))
122-
! call polympo_getMPCurElmID(mpMesh,numMPs,c_loc(mp2Elm))
120+
call polympo_getMeshElmMass(mpMesh,nCells,c_loc(meshElmMass))
121+
call polympo_getMeshVtxMass(mpMesh,nVertices,c_loc(meshVtxMass))
122+
call polympo_getMPCurElmID(mpMesh,numMPs,c_loc(mp2Elm))
123123

124-
! do i = 1, numMPs
125-
! vID = verticesOnCell(1,mp2Elm(i))
126-
! call assert(meshVtxMass(vID) < TEST_VAL+TOLERANCE .and. meshVtxMass(vID) > TEST_VAL-TOLERANCE, "Error: wrong vtx mass")
124+
do i = 1, numMPs
125+
vID = verticesOnCell(1,mp2Elm(i))
126+
call assert(meshVtxMass(vID) < TEST_VAL+TOLERANCE .and. meshVtxMass(vID) > TEST_VAL-TOLERANCE, "Error: wrong vtx mass")
127127

128-
! call assert(meshElmMass(mp2Elm(i)) < TEST_VAL+TOLERANCE &
129-
! .and. meshElmMass(mp2Elm(i)) > TEST_VAL-TOLERANCE, "Error: wrong elm mass")
130-
! end do
128+
call assert(meshElmMass(mp2Elm(i)) < TEST_VAL+TOLERANCE &
129+
.and. meshElmMass(mp2Elm(i)) > TEST_VAL-TOLERANCE, "Error: wrong elm mass")
130+
end do
131131
end do
132132

133133
deallocate(mpMass)

0 commit comments

Comments
 (0)