Renamed APIs, removed debug comments

Author: dhyan1272

src/pmpo_MPMesh.cpp

@@ -54,7 +54,7 @@ void MPMesh::calculateStrain(){
         vTanOverR = vTanOverR + MPsBasis(mp, i) * tanLatVertexRotatedOverRadius(iVertex, 0) * velField(iVertex, 1);
         //Debugging
         if(MPsAppID(mp)==0){
-         printf("Strain Calc: iVertex %d vel field %.15e %.15e \n", iVertex, velField(iVertex, 0), velField(iVertex, 1));
+         //printf("Strain Calc: iVertex %d vel field %.15e %.15e \n", iVertex, velField(iVertex, 0), velField(iVertex, 1));
         }
       }
       MPsStrainRate(mp, 0) =  v11 - vTanOverR;
@@ -66,9 +66,6 @@ void MPMesh::calculateStrain(){
 }
 
 void MPMesh::calculateStress(){
-  static int int_xx =0;
-  //std::cout<<"Counting stress:  "<< int_xx << std::endl;
-  
   //MeshFields  
   auto solveStress = p_mesh->getMeshField<polyMPO::MeshF_SolveStress>();
   auto elasticTimeStep = p_mesh->getElasticTimeStep();
@@ -98,7 +95,6 @@ void MPMesh::calculateStress(){
     }
   };
   p_MPs->parallel_for(setMPStress, "setMPStress");
-  int_xx++;
 } 
 
 void MPMesh::calculateStressDivergence(){

src/pmpo_c.cpp

@@ -608,38 +608,18 @@ void polympo_getMPVel_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs,
   pumipic::RecordTime("PolyMPO_getMPVel", timer.seconds());
 }
 
-void polympo_setMPStrainRate_f(MPMesh_ptr p_mpmesh){
+void polympo_calculateMPStrainRate_f(MPMesh_ptr p_mpmesh){
   checkMPMeshValid(p_mpmesh);
   auto mpMesh = ((polyMPO::MPMesh*)p_mpmesh);
   mpMesh->calculateStrain(); 
 }
 
-void polympo_getMPStrainRate_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStrainRateHost){
-  checkMPMeshValid(p_mpmesh);
-  std::cerr << "Error: This routine is not implemented yet\n";
-  exit(1);
-  (void)p_mpmesh;
-  (void)nComps;
-  (void)numMPs;
-  (void)mpStrainRateHost;
-}
-
-void polympo_setMPStress_f(MPMesh_ptr p_mpmesh){
+void polympo_calculateMPStress_f(MPMesh_ptr p_mpmesh){
   checkMPMeshValid(p_mpmesh);
   auto mpMesh = ((polyMPO::MPMesh*)p_mpmesh);
   mpMesh->calculateStress(); 
 }
 
-void polympo_getMPStress_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStressHost){
-  checkMPMeshValid(p_mpmesh);
-  std::cerr << "Error: This routine is not implemented yet\n";
-  exit(1);
-  (void)p_mpmesh;
-  (void)nComps;
-  (void)numMPs;
-  (void)mpStressHost;
-}
-
 void polympo_setAreaMP_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* areaMPHost){
   Kokkos::Timer timer;
   checkMPMeshValid(p_mpmesh);

src/pmpo_c.h

@@ -46,10 +46,8 @@ void polympo_setMPMass_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs
 void polympo_getMPMass_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpMassHost);
 void polympo_setMPVel_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, const double* mpVelIn);
 void polympo_getMPVel_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpVelHost);
-void polympo_setMPStrainRate_f(MPMesh_ptr p_mpmesh);
-void polympo_getMPStrainRate_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStrainRateHost);
-void polympo_setMPStress_f(MPMesh_ptr p_mpmesh);
-void polympo_getMPStress_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* mpStressHost);
+void polympo_calculateMPStrainRate_f(MPMesh_ptr p_mpmesh);
+void polympo_calculateMPStress_f(MPMesh_ptr p_mpmesh);
 void polympo_setAreaMP_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* areaMPHost);
 void polympo_setIcePressureMP_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* icePressureMPHost);
 void polympo_getReplacementPressureMP_f(MPMesh_ptr p_mpmesh, const int nComps, const int numMPs, double* replacementPressureMPHost);

src/pmpo_fortran.f90

@@ -364,15 +364,15 @@ subroutine polympo_getMPVel(mpMesh, nComps, numMPs, array) &
   end subroutine
 
   !MP Strain
-  subroutine polympo_setMPStrainRate(mpMesh) &
-             bind(C, NAME='polympo_setMPStrainRate_f')
+  subroutine polympo_calculateMPStrainRate(mpMesh) &
+             bind(C, NAME='polympo_calculateMPStrainRate_f')
     use :: iso_c_binding
     type(c_ptr), value :: mpMesh
   end subroutine
 
   !MP Stress
-  subroutine polympo_setMPStress(mpMesh) &
-             bind(C, NAME='polympo_setMPStress_f')
+  subroutine polympo_calculateMPStress(mpMesh) &
+             bind(C, NAME='polympo_calculateMPStress_f')
     use :: iso_c_binding
     type(c_ptr), value :: mpMesh
   end subroutine