Commit d8afcd61 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Renamed storeWeightLinks to store_weightlinks

parent 0e2fe293
...@@ -221,7 +221,7 @@ remapBilinearWeights(RemapSearch &rsearch, RemapVars &rv) ...@@ -221,7 +221,7 @@ remapBilinearWeights(RemapSearch &rsearch, RemapVars &rv)
{ {
// Successfully found iw,jw - compute weights // Successfully found iw,jw - compute weights
bilinearSetWeights(iw, jw, wgts); bilinearSetWeights(iw, jw, wgts);
storeWeightLinks(0, 4, src_add, wgts, tgt_cell_add, weightLinks); store_weightlinks(0, 4, src_add, wgts, tgt_cell_add, weightLinks);
} }
else else
{ {
...@@ -240,7 +240,7 @@ remapBilinearWeights(RemapSearch &rsearch, RemapVars &rv) ...@@ -240,7 +240,7 @@ remapBilinearWeights(RemapSearch &rsearch, RemapVars &rv)
{ {
tgt_grid->cell_frac[tgt_cell_add] = 1.; tgt_grid->cell_frac[tgt_cell_add] = 1.;
renormalizeWeights(src_lats, wgts); renormalizeWeights(src_lats, wgts);
storeWeightLinks(0, 4, src_add, wgts, tgt_cell_add, weightLinks); store_weightlinks(0, 4, src_add, wgts, tgt_cell_add, weightLinks);
} }
} }
} }
......
...@@ -717,7 +717,7 @@ remapConservWeights(RemapSearch &rsearch, RemapVars &rv) ...@@ -717,7 +717,7 @@ remapConservWeights(RemapSearch &rsearch, RemapVars &rv)
tgt_grid->cell_frac[tgt_cell_add] = varraySum(num_weights, partial_weights); tgt_grid->cell_frac[tgt_cell_add] = varraySum(num_weights, partial_weights);
storeWeightLinks(1, num_weights, srch_add[ompthID].data(), partial_weights.data(), tgt_cell_add, weightLinks); store_weightlinks(1, num_weights, srch_add[ompthID].data(), partial_weights.data(), tgt_cell_add, weightLinks);
} }
progress::update(0, 1, 1); progress::update(0, 1, 1);
......
...@@ -82,7 +82,7 @@ remapDistwgtWeights(size_t numNeighbors, RemapSearch &rsearch, RemapVars &rv) ...@@ -82,7 +82,7 @@ remapDistwgtWeights(size_t numNeighbors, RemapSearch &rsearch, RemapVars &rv)
if (knnWeights[ompthID].m_mask[n]) tgt_grid->cell_frac[tgt_cell_add] = 1.0; if (knnWeights[ompthID].m_mask[n]) tgt_grid->cell_frac[tgt_cell_add] = 1.0;
// Store the link // Store the link
storeWeightLinks(0, nadds, knnWeights[ompthID].m_addr.data(), knnWeights[ompthID].m_dist.data(), tgt_cell_add, weightLinks); store_weightlinks(0, nadds, knnWeights[ompthID].m_addr.data(), knnWeights[ompthID].m_dist.data(), tgt_cell_add, weightLinks);
} }
progress::update(0, 1, 1); progress::update(0, 1, 1);
......
...@@ -154,8 +154,8 @@ sort_add_and_wgts_bicubic(size_t *src_add, double (&weights)[4][4]) ...@@ -154,8 +154,8 @@ sort_add_and_wgts_bicubic(size_t *src_add, double (&weights)[4][4])
} }
void void
storeWeightLinks(int lalloc, size_t numWeights, size_t *srch_add, double *weights, size_t cell_add, store_weightlinks(int lalloc, size_t numWeights, size_t *srch_add, double *weights, size_t cell_add,
std::vector<WeightLinks> &weightLinks) std::vector<WeightLinks> &weightLinks)
{ {
weightLinks[cell_add].nlinks = 0; weightLinks[cell_add].nlinks = 0;
weightLinks[cell_add].offset = 0; weightLinks[cell_add].offset = 0;
......
...@@ -50,8 +50,8 @@ struct WeightLinks4 ...@@ -50,8 +50,8 @@ struct WeightLinks4
void weightLinksAlloc(size_t numNeighbors, size_t gridSize, std::vector<WeightLinks> &weightLinks); void weightLinksAlloc(size_t numNeighbors, size_t gridSize, std::vector<WeightLinks> &weightLinks);
void weightLinks4Alloc(size_t gridSize, std::vector<WeightLinks4> &weightLinks); void weightLinks4Alloc(size_t gridSize, std::vector<WeightLinks4> &weightLinks);
void storeWeightLinks(int lalloc, size_t numWeights, size_t *srch_add, double *weights, size_t cell_add, void store_weightlinks(int lalloc, size_t numWeights, size_t *srch_add, double *weights, size_t cell_add,
std::vector<WeightLinks> &weightLinks); std::vector<WeightLinks> &weightLinks);
void store_weightlinks_bicubic(size_t *srch_add, double (&weights)[4][4], size_t cell_add, std::vector<WeightLinks4> &weightLinks); void store_weightlinks_bicubic(size_t *srch_add, double (&weights)[4][4], size_t cell_add, std::vector<WeightLinks4> &weightLinks);
void weightLinksToRemapLinks(int lalloc, size_t gridSize, std::vector<WeightLinks> &weightLinks, RemapVars &rv); void weightLinksToRemapLinks(int lalloc, size_t gridSize, std::vector<WeightLinks> &weightLinks, RemapVars &rv);
void weightLinks4ToRemapLinks(size_t gridSize, std::vector<WeightLinks4> &weightLinks, RemapVars &rv); void weightLinks4ToRemapLinks(size_t gridSize, std::vector<WeightLinks4> &weightLinks, RemapVars &rv);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment