Commit 98f36f4b authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

gridToCell renamed to gridToUnstructured

parent 7088d6d2
......@@ -11,9 +11,9 @@ Version 1.5.0 (?? March 2011):
Fixed bugs:
* sellonlatbox: does not work as expected when selecting all longitutes
* sellonlatbox: initialization missing for unstructured grids
* detrend: integer overflow; wrong result for ntimesteps > 46340
* trend and detrend: integer overflow; wrong result for ntimesteps > 46340
* spcut: only correct results with continuous wave numbers starting at 1
* remaplib: fix data race in calculation of bin_addr (OpenMP)
* remaplib: fixed data race in calculation of bin_addr (OpenMP)
Version 1.4.7 (06 January 2011):
......
......@@ -78,7 +78,7 @@ Compilation is done by performing the following steps:
Here is an example GRIB2 configuration with a JASPER enabled GRIB\_API version:
\begin{verbatim}
./configure --with-gribapi=<GRIB_API root directory> \
./configure --with-grib_api=<GRIB_API root directory> \
--with-jasper=<JASPER root directory>
\end{verbatim}
......
......@@ -105,7 +105,7 @@ void *Arithlat(void *argument)
}
else if ( gridtype == GRID_GME )
{
gridID = gridToCell(gridID);
gridID = gridToUnstructured(gridID);
}
else
{
......
......@@ -148,7 +148,7 @@ void *Output(void *argument)
if ( operatorID == OUTPUTFLD || operatorID == OUTPUTXYZ || operatorID == OUTPUTKEY )
{
if ( gridInqType(gridID) == GRID_GME ) gridID = gridToCell(gridID);
if ( gridInqType(gridID) == GRID_GME ) gridID = gridToUnstructured(gridID);
if ( gridInqType(gridID) != GRID_UNSTRUCTURED && gridInqType(gridID) != GRID_CURVILINEAR )
gridID = gridToCurvilinear(gridID);
......
......@@ -654,7 +654,7 @@ void *Outputgmt(void *argument)
zaxisID = vlistInqVarZaxis(vlistID, varID);
missval = vlistInqVarMissval(vlistID, varID);
if ( gridInqType(gridID) == GRID_GME ) gridID = gridToCell(gridID);
if ( gridInqType(gridID) == GRID_GME ) gridID = gridToUnstructured(gridID);
if ( gridInqType(gridID) != GRID_UNSTRUCTURED && gridInqType(gridID) != GRID_CURVILINEAR )
{
......
......@@ -534,7 +534,7 @@ void *Remap(void *argument)
remaps[0].grid.grid2_nvgp = gridInqSize(gridID2);
remaps[0].grid.grid2_vgpm = (int *) realloc(remaps[0].grid.grid2_vgpm,
gridInqSize(gridID2)*sizeof(int));
gridID2_gme = gridToCell(gridID2);
gridID2_gme = gridToUnstructured(gridID2);
gridInqMaskGME(gridID2_gme, remaps[0].grid.grid2_vgpm);
for ( i = 0; i < gridsize2; ++i )
if ( remaps[0].grid.grid2_vgpm[i] ) isize++;
......
......@@ -232,8 +232,8 @@ void *Setgrid(void *argument)
}
else
{
if ( gridtype == GRID_CURVILINEAR ) gridID2 = gridToCurvilinear(gridID1);
else if ( gridtype == GRID_UNSTRUCTURED ) gridID2 = gridToCell(gridID1);
if ( gridtype == GRID_CURVILINEAR ) gridID2 = gridToCurvilinear(gridID1);
else if ( gridtype == GRID_UNSTRUCTURED ) gridID2 = gridToUnstructured(gridID1);
else cdoAbort("Unsupported grid name: %s", gridname);
}
......
......@@ -47,7 +47,7 @@ void *Writegrid(void *argument)
gridtype = gridInqType(gridID);
gridsize = gridInqSize(gridID);
if ( gridtype == GRID_GME ) gridID = gridToCell(gridID);
if ( gridtype == GRID_GME ) gridID = gridToUnstructured(gridID);
if ( gridtype != GRID_CURVILINEAR && gridtype != GRID_UNSTRUCTURED )
gridID = gridToCurvilinear(gridID);
......
......@@ -1059,7 +1059,7 @@ void eca4(const ECA_REQUEST_4 *request)
if ( gridtype != GRID_UNSTRUCTURED && gridtype != GRID_CURVILINEAR )
{
if ( gridtype == GRID_GME )
gridID = gridToCell(gridID);
gridID = gridToUnstructured(gridID);
else
gridID = gridToCurvilinear(gridID);
}
......
......@@ -817,7 +817,7 @@ int gridToCurvilinear(int gridID1)
}
int gridToCell(int gridID1)
int gridToUnstructured(int gridID1)
{
int gridID2;
int gridtype, gridsize;
......@@ -1235,7 +1235,7 @@ int gridGenArea(int gridID, double *area)
if ( gridtype == GRID_GME )
{
lgriddestroy = TRUE;
gridID = gridToCell(gridID);
gridID = gridToUnstructured(gridID);
grid_mask = (int *) malloc(gridsize*sizeof(int));
gridInqMaskGME(gridID, grid_mask);
}
......@@ -1362,7 +1362,7 @@ int gridGenWeights(int gridID, double *grid_area, double *grid_wgts)
if ( gridtype == GRID_GME )
{
gridID = gridToCell(gridID);
gridID = gridToUnstructured(gridID);
grid_mask = (int *) malloc(gridsize*sizeof(int));
gridInqMaskGME(gridID, grid_mask);
}
......
......@@ -9,7 +9,7 @@ int referenceToGrid(int gridID);
void gridToDegree(const char *units, const char *string, int gridsize, double *array);
int gridToZonal(int gridID);
int gridToMeridional(int gridID);
int gridToCell(int gridID);
int gridToUnstructured(int gridID);
int gridToCurvilinear(int gridID);
int gridToRegular(int gridID);
void field2regular(int gridID1, int gridID2, double missval, double *array, int nmiss);
......
......@@ -1014,7 +1014,7 @@ void remapGridInit(int map_type, int lextrapolate, int gridID1, int gridID2, rem
{
if ( gridInqType(rg->gridID1) == GRID_GME )
{
gridID1_gme = gridToCell(rg->gridID1);
gridID1_gme = gridToUnstructured(rg->gridID1);
rg->grid1_nvgp = gridInqSize(gridID1_gme);
gridID1 = gridDuplicate(gridID1_gme);
gridCompress(gridID1);
......@@ -1032,7 +1032,7 @@ void remapGridInit(int map_type, int lextrapolate, int gridID1, int gridID2, rem
{
if ( gridInqType(rg->gridID2) == GRID_GME )
{
gridID2_gme = gridToCell(rg->gridID2);
gridID2_gme = gridToUnstructured(rg->gridID2);
rg->grid2_nvgp = gridInqSize(gridID2_gme);
gridID2 = gridDuplicate(gridID2_gme);
gridCompress(gridID2);
......@@ -6756,7 +6756,7 @@ void read_remap_scrip(const char *interp_file, int gridID1, int gridID2, int *ma
if ( gridInqType(gridID1) == GRID_GME )
{
rg->grid1_nvgp = gridInqSize(gridID1);
gridID1_gme_c = gridToCell(gridID1);
gridID1_gme_c = gridToUnstructured(gridID1);
}
remapGridRealloc(rv->map_type, rg);
......
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