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

cdo_print_grid: added uvRelativeToGrid.

parent a013ddbc
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "cdo.h" #include "cdo.h"
#include "cdo_int.h" #include "cdo_int.h"
#include "pstream.h" #include "pstream.h"
#include "grid.h"
#include "util.h" #include "util.h"
......
...@@ -321,7 +321,7 @@ void *DestaggerUV() ...@@ -321,7 +321,7 @@ void *DestaggerUV()
if ( gridID0 == -1 ) cdoAbort(" Cannot define DESTAGGERED grid for U, V."); if ( gridID0 == -1 ) cdoAbort(" Cannot define DESTAGGERED grid for U, V.");
// TODO if ( cdoDebugExt>=10 ) gridPrint(gridID0, 1,0); if ( cdoDebugExt>=10 ) cdo_print_grid(gridID0, 1);
xfirst_R =gridInqXval(gridID0,0); // reference grid for non-staggered fields (default: search for temperature; otherwise: create a new grid) xfirst_R =gridInqXval(gridID0,0); // reference grid for non-staggered fields (default: search for temperature; otherwise: create a new grid)
yfirst_R =gridInqYval(gridID0,0); yfirst_R =gridInqYval(gridID0,0);
...@@ -910,8 +910,7 @@ void *TransformUV(int operatorID) ...@@ -910,8 +910,7 @@ void *TransformUV(int operatorID)
cdoPrint("LAT-LON grid created."); cdoPrint("LAT-LON grid created.");
}// end of if (gridIDcurvl==-1) }// end of if (gridIDcurvl==-1)
}// end of if (operatorID != ROTUVN) }// end of if (operatorID != ROTUVN)
// TODO int uvRelativeFlag = gridInqUvRelativeToGrid(gridID); int uvRelativeFlag = gridInqUvRelativeToGrid(gridID);
int uvRelativeFlag = 1;
if (uvRelativeFlag!=1) if (uvRelativeFlag!=1)
{ {
cdoPrint("NOTICE: grid with id:%d has NOT uv relative to grid.", gridID); cdoPrint("NOTICE: grid with id:%d has NOT uv relative to grid.", gridID);
......
...@@ -381,7 +381,7 @@ void grid_print_kernel(int gridID, int opt, FILE *fp) ...@@ -381,7 +381,7 @@ void grid_print_kernel(int gridID, int opt, FILE *fp)
{ {
int nd, ni, ni2, ni3; int nd, ni, ni2, ni3;
gridInqParamGME(gridID, &nd, &ni, &ni2, &ni3); gridInqParamGME(gridID, &nd, &ni, &ni2, &ni3);
fprintf(fp, "ni = %d\n", ni ); fprintf(fp, "ni = %d\n", ni);
break; break;
} }
default: default:
...@@ -410,6 +410,11 @@ void grid_print_kernel(int gridID, int opt, FILE *fp) ...@@ -410,6 +410,11 @@ void grid_print_kernel(int gridID, int opt, FILE *fp)
if ( mask ) Free(mask); if ( mask ) Free(mask);
} }
int uvRelativeToGrid = gridInqUvRelativeToGrid(gridID);
if ( uvRelativeToGrid > 0 )
fprintf(fp, "uvRelativeToGrid = %d\n", uvRelativeToGrid);
int projID = gridInqProj(gridID); int projID = gridInqProj(gridID);
if ( projID != CDI_UNDEFID && gridInqType(projID) == GRID_PROJECTION ) if ( projID != CDI_UNDEFID && gridInqType(projID) == GRID_PROJECTION )
grid_print_kernel(projID, opt, fp); grid_print_kernel(projID, opt, fp);
......
...@@ -569,7 +569,7 @@ void *Samplegrid(void *argument); // "samplegrid", "subgrid" ...@@ -569,7 +569,7 @@ void *Samplegrid(void *argument); // "samplegrid", "subgrid"
// HIRLAM_EXTENSIONS // HIRLAM_EXTENSIONS
#define SelmultiOperators {"selmulti", "delmulti", "changemulti"} #define SelmultiOperators {"selmulti", "delmulti", "changemulti"}
#define WindTransOperators {"uvDestag", "rotuvN","rotuvNorth", "projuvLatLon"} #define WindTransOperators {"uvDestag", "rotuvN", "rotuvNorth", "projuvLatLon"}
#define SamplegridOperators {"samplegrid", "subgrid"} #define SamplegridOperators {"samplegrid", "subgrid"}
......
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