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

Renamed gradientsType to RemapGradients.

parent f94aa59e
......@@ -961,7 +961,7 @@ Remap(void *argument)
needGradients = true;
}
gradientsType gradients;
RemapGradients gradients;
if (needGradients) gradients.init(grid1sizemax);
std::vector<double> array1(grid1sizemax);
......
......@@ -156,7 +156,7 @@ void remapConserv(RemapSearch &rsearch, const double *restrict src_array, double
void remapStat(int remapOrder, RemapGrid &src_grid, RemapGrid &tgt_grid, RemapVars &rv, const double *restrict array1,
const double *restrict array2, double missval);
void remapGradients(RemapGrid &grid, const double *restrict array, gradientsType &gradients);
void remapGradients(RemapGrid &grid, const double *restrict array, RemapGradients &gradients);
void sort_add(size_t num_links, size_t num_wts, size_t *restrict add1, size_t *restrict add2, double *restrict weights);
void sort_iter(size_t num_links, size_t num_wts, size_t *restrict add1, size_t *restrict add2, double *restrict weights,
......
......@@ -73,7 +73,7 @@ bicubicWarning(void)
static void
bicubicRemap(double *restrict tgt_point, const double *restrict src_array, double wgts[4][4], const size_t src_add[4],
gradientsType &gradients)
RemapGradients &gradients)
{
const double *restrict glat = &gradients.grad_lat[0];
const double *restrict glon = &gradients.grad_lon[0];
......@@ -217,7 +217,7 @@ remapBicubic(RemapSearch &rsearch, const double *restrict src_array, double *res
// Compute mappings from source to target grid
gradientsType gradients(src_grid->size);
RemapGradients gradients(src_grid->size);
remapGradients(*src_grid, src_array, gradients);
double findex = 0;
......
......@@ -12,7 +12,7 @@
*/
void
remap(double *restrict dst_array, double missval, size_t dst_size, const RemapVars &rv, const double *restrict src_array,
gradientsType &gradients)
RemapGradients &gradients)
{
/*
Input arrays:
......
#ifndef REMAP_VARS_H
#define REMAP_VARS_H
class gradientsType
class RemapGradients
{
public:
std::vector<double> grad_lat;
......@@ -16,8 +16,8 @@ public:
grad_latlon.resize(size);
}
gradientsType(size_t size) { init(size); }
gradientsType() {}
RemapGradients(size_t size) { init(size); }
RemapGradients() {}
};
enum struct RemapMethod
......@@ -68,7 +68,7 @@ struct RemapVars
};
void remap(double *restrict dst_array, double missval, size_t dst_size, const RemapVars &rv, const double *restrict src_array,
gradientsType &gradients);
RemapGradients &gradients);
void remap_laf(double *restrict dst_array, double missval, size_t dst_size, const RemapVars &rv,
const double *restrict src_array);
void remap_sum(double *restrict dst_array, double missval, size_t dst_size, const RemapVars &rv,
......
......@@ -867,7 +867,7 @@ remapStat(int remapOrder, RemapGrid &src_grid, RemapGrid &tgt_grid, RemapVars &r
/*****************************************************************************/
void
remapGradients(RemapGrid &grid, const double *restrict array, gradientsType &gradients)
remapGradients(RemapGrid &grid, const double *restrict array, RemapGradients &gradients)
{
if (grid.rank != 2) cdoAbort("Internal problem (remapGradients), grid rank = %d!", grid.rank);
......
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