FELIX, Interface with MPAS, pass dissipation heat to MPAS

kel85uk · Aug 25, 2016 · 5c34de1 · 5c34de1
1 parent 39409c3
commit 5c34de1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/FELIX/interface_with_mpas/Interface.cpp b/src/FELIX/interface_with_mpas/Interface.cpp
@@ -67,6 +67,7 @@ void velocity_solver_solve_fo(int nLayers, int nGlobalVertices,
     const std::vector<double>& bedTopographyData,
     const std::vector<double>& smbData,
     const std::vector<double>& temperatureOnTetra,
+    std::vector<double>& dissipationHeatOnTetra,
     std::vector<double>& velocityOnVertices,
     const double& deltat) {
 
@@ -240,7 +241,7 @@ void velocity_solver_solve_fo(int nLayers, int nGlobalVertices,
     for (int iTetra = 0; iTetra < 3; iTetra++) {
       stk::mesh::Entity elem = meshStruct->bulkData->get_entity(stk::topology::ELEMENT_RANK, ++gId);
       double* dissipationHeat = stk::mesh::field_data(*dissipationHeatField, elem);
-//      dissipationHeatOnTetra[lId++] = dissipationHeat[0];
+      dissipationHeatOnTetra[lId++] = dissipationHeat[0];
     }
   }
 

diff --git a/src/FELIX/interface_with_mpas/Interface.hpp b/src/FELIX/interface_with_mpas/Interface.hpp
@@ -84,7 +84,7 @@ void velocity_solver_solve_fo(int nLayers, int nGlobalVertices, int nGlobalTrian
     bool ordering, bool first_time_step, const std::vector<int>& indexToVertexID, const std::vector<int>& indexToTriangleID,
     double minBeta, const std::vector<double>& regulThk,  const std::vector<double>& levelsNormalizedThickness, const std::vector<double>& elevationData, const std::vector<double>& thicknessData,
     const std::vector<double>& betaData, const std::vector<double>& bedTopographyData, const std::vector<double>& SMBData, const std::vector<double>& temperatureOnTetra,
-    std::vector<double>& velocityOnVertices, const double& deltat=0.0);
+    std::vector<double>& dissipationHeatOnTetra, std::vector<double>& velocityOnVertices, const double& deltat=0.0);
 
 
 // 3