Skip to content

Commit

Permalink
Updating and simplifying the API for Initialize(Source/Target)Dimensi…
Browse files Browse the repository at this point in the history 
…ons for an in-memory mesh
  • Loading branch information
@vijaysm
vijaysm committed Mar 27, 2018
1 parent 7e4f5e2 commit cf111a4
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 140 deletions.
10 changes: 8 additions & 2 deletions src/GenerateOfflineMap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,10 +211,16 @@ try {
// Initialize dimension information from file
if (!mapRemap.AreDimensionsInitialized()) {
AnnounceStartBlock("Initializing dimensions of map");
std::vector<std::string> srcDimNames, tgtDimNames;
std::vector<int> srcDimSizes, tgtDimSizes;
Announce("Input mesh");
mapRemap.InitializeSourceDimensionsFromMesh(meshInput);
srcDimNames.push_back("num_elem");
srcDimSizes.push_back(meshInput.faces.size());
mapRemap.InitializeSourceDimensions(srcDimNames, srcDimSizes);
Announce("Output mesh");
mapRemap.InitializeTargetDimensionsFromMesh(meshOutput);
tgtDimNames.push_back("num_elem");
tgtDimSizes.push_back(meshOutput.faces.size());
mapRemap.InitializeTargetDimensions(tgtDimNames, tgtDimSizes);
AnnounceEndBlock(NULL);
}

Expand Down
144 changes: 24 additions & 120 deletions src/OfflineMap.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,64 +183,19 @@ void OfflineMap::InitializeSourceDimensionsFromFile(

///////////////////////////////////////////////////////////////////////////////

void OfflineMap::InitializeSourceDimensionsFromMesh(
const Mesh & sourceMesh
void OfflineMap::InitializeSourceDimensions(
const std::vector<std::string>& p_srcDimNames,
const std::vector<int>& p_srcDimSizes
) {
// Push rectilinear attributes into array
const int nElems = sourceMesh.faces.size();
switch(sourceMesh.type) {
case Mesh::MeshType_CubedSphere:
m_vecSourceDimSizes.resize(1);
m_vecSourceDimNames.resize(1);
m_vecSourceDimSizes[0] = nElems;
m_vecSourceDimNames[0] = "num_elem";
break;
case Mesh::MeshType_RLL:
_EXCEPTIONT("MeshType_RLL not implemented");
m_vecSourceDimSizes.resize(2);
m_vecSourceDimNames.resize(2);
m_vecSourceDimSizes[0] = std::sqrt(nElems/2);
m_vecSourceDimSizes[1] = 2*m_vecSourceDimSizes[0];
m_vecSourceDimNames[0] = "lat";
m_vecSourceDimNames[1] = "lon";
break;
case Mesh::MeshType_IcosaHedral:
m_vecSourceDimSizes.resize(1);
m_vecSourceDimNames.resize(1);
m_vecSourceDimSizes[0] = nElems;
m_vecSourceDimNames[0] = "num_elem";
break;
default:
m_vecSourceDimSizes.resize(1);
m_vecSourceDimNames.resize(1);
m_vecSourceDimSizes[0] = 0;
m_vecSourceDimNames[0] = "";
break;
}
return;
}

///////////////////////////////////////////////////////////////////////////////

void OfflineMap::InitializeSourceDimensionsFromMesh(
const int nelemx, const int nelemy
) {
// Push rectilinear attributes into array
if (nelemy == 0) {
m_vecSourceDimSizes.resize(1);
m_vecSourceDimNames.resize(1);
m_vecSourceDimSizes[0] = nelemx;
m_vecSourceDimNames[0] = "num_elem";

} else {
m_vecSourceDimSizes.resize(2);
m_vecSourceDimNames.resize(2);
m_vecSourceDimSizes[0] = nelemx;
m_vecSourceDimSizes[1] = nelemy;
m_vecSourceDimNames[0] = "lat";
m_vecSourceDimNames[1] = "lon";
}
return;
m_vecSourceDimNames.clear();
m_vecSourceDimNames.resize(p_srcDimNames.size());
std::copy(p_srcDimNames.begin(), p_srcDimNames.end(), m_vecSourceDimNames.begin());

m_vecSourceDimSizes.clear();
m_vecSourceDimSizes.resize(p_srcDimSizes.size());
std::copy(p_srcDimSizes.begin(), p_srcDimSizes.end(), m_vecSourceDimSizes.begin());

return;
}

///////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -404,70 +359,19 @@ void OfflineMap::InitializeTargetDimensionsFromFile(

///////////////////////////////////////////////////////////////////////////////

void OfflineMap::InitializeTargetDimensionsFromMesh(
const Mesh & targetMesh
) {
// Push rectilinear attributes into array
const int nElems = targetMesh.faces.size();
switch(targetMesh.type) {
case Mesh::MeshType_CubedSphere:
m_vecTargetDimSizes.resize(1);
m_vecTargetDimNames.resize(1);
// should probably have nxElems * nyELems
// That would mean we need to resize(2) and not to 1.
m_vecTargetDimSizes[0] = nElems;
m_vecTargetDimNames[0] = "num_elem";
break;
case Mesh::MeshType_RLL:
_EXCEPTIONT("MeshType_RLL not implemented");
m_vecTargetDimSizes.resize(2);
m_vecTargetDimNames.resize(2);
m_vecTargetDimSizes[0] = std::sqrt(nElems/2);
m_vecTargetDimSizes[1] = 2*m_vecTargetDimSizes[0];

m_vecTargetDimNames[0] = "lat";
m_vecTargetDimNames[1] = "lon";
break;
case Mesh::MeshType_IcosaHedral:
m_vecTargetDimSizes.resize(1);
m_vecTargetDimNames.resize(1);
m_vecTargetDimSizes[0] = nElems;
m_vecTargetDimNames[0] = "num_elem";
break;
default:
m_vecTargetDimSizes.resize(1);
m_vecTargetDimNames.resize(1);
m_vecTargetDimSizes[0] = 0;
m_vecTargetDimNames[0] = "";
break;
}
return;
}

///////////////////////////////////////////////////////////////////////////////

void OfflineMap::InitializeTargetDimensionsFromMesh(
const int nelemx, const int nelemy
void OfflineMap::InitializeTargetDimensions(
const std::vector<std::string>& p_tgtDimNames,
const std::vector<int>& p_tgtDimSizes
) {
// Push rectilinear attributes into array
if (nelemy == 0) {
m_vecTargetDimSizes.resize(1);
m_vecTargetDimNames.resize(1);
// should probably have nxElems * nyELems
// That would mean we need to resize(2) and not to 1.
m_vecTargetDimSizes[0] = nelemx;
m_vecTargetDimNames[0] = "num_elem";
}
else {
m_vecTargetDimSizes.resize(2);
m_vecTargetDimNames.resize(2);
m_vecTargetDimSizes[0] = nelemx;
m_vecTargetDimSizes[1] = nelemy;

m_vecTargetDimNames[0] = "lat";
m_vecTargetDimNames[1] = "lon";
}
return;
m_vecTargetDimNames.clear();
m_vecTargetDimNames.resize(p_tgtDimNames.size());
std::copy(p_tgtDimNames.begin(), p_tgtDimNames.end(), m_vecTargetDimNames.begin());

m_vecTargetDimSizes.clear();
m_vecTargetDimSizes.resize(p_tgtDimSizes.size());
std::copy(p_tgtDimSizes.begin(), p_tgtDimSizes.end(), m_vecTargetDimSizes.begin());

return;
}

///////////////////////////////////////////////////////////////////////////////
Expand Down
24 changes: 6 additions & 18 deletions src/OfflineMap.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,9 @@ class OfflineMap {
/// <summary>
/// Initialize the array of input dimensions from a mesh.
/// </summary>
void InitializeSourceDimensionsFromMesh(
const Mesh & sourceMesh
);

/// <summary>
/// Initialize the array of input dimensions from a mesh.
/// </summary>
void InitializeSourceDimensionsFromMesh(
const int nelemx, const int nelemy
void InitializeSourceDimensions(
const std::vector<std::string>& p_srcDimNames,
const std::vector<int>& p_srcDimSizes
);

/// <summary>
Expand All @@ -72,15 +66,9 @@ class OfflineMap {
/// <summary>
/// Initialize the array of output dimensions from a mesh.
/// </summary>
void InitializeTargetDimensionsFromMesh(
const Mesh & targetMesh
);

/// <summary>
/// Initialize the array of output dimensions from a mesh.
/// </summary>
void InitializeTargetDimensionsFromMesh(
const int nelemx, const int nelemy
void InitializeTargetDimensions(
const std::vector<std::string>& p_tgtDimNames,
const std::vector<int>& p_tgtDimSizes
);

private:
Expand Down

0 comments on commit cf111a4

Please sign in to comment.