Commit ee179c63 authored by loring's avatar loring

ggcm reader warning cleanup


git-svn-id: http://visit.ilight.com/svn/visit/trunk/src@23779 18c085ea-50e0-402c-830e-de6fd14e8384
parent 3f317f17
......@@ -38,21 +38,25 @@ static void *xmalloc(size_t size);
/** Method: avtGGCM constructor
* Programmer: tfogal -- generated by xml2avt
* Creation: Thu Jun 1 13:38:54 PST 2006 */
avtGGCMFileFormat::avtGGCMFileFormat(const char *filename,
DBOptionsAttributes *db)
: avtMTSDFileFormat(&filename, 1)
avtGGCMFileFormat::avtGGCMFileFormat(
const char *filename,
DBOptionsAttributes *db)
:
avtMTSDFileFormat(&filename,1),
fn_grid(NULL),
selsApplied(NULL),
restricted(false)
{
dim[0] = dim[1] = dim[2] = 0;
min[0] = min[1] = min[2] = 0.0;
max[0] = max[1] = max[2] = 0.0;
assert(filename != NULL);
DeriveGridFile(filename, &this->fn_grid);
if(this->fn_grid == NULL)
{
EXCEPTION1(InvalidDBTypeException, "Could not derive grid filename.");
}
this->selList.clear();
this->selsApplied = NULL;
this->restricted = false;
}
/** The second argument to DeriveGridFile is filled with the dynamically
......@@ -398,9 +402,8 @@ void avtGGCMFileFormat::SetupDomain()
avtSpatialBoxSelection *sel =
dynamic_cast<avtSpatialBoxSelection*>(*(selList[i]));
double min[3], max[3];
sel->GetMins(min);
sel->GetMaxs(max);
sel->GetMins(this->min);
sel->GetMaxs(this->max);
this->restricted = true;
debug2 << "restriction:"
......
......@@ -71,8 +71,8 @@ class avtGGCMFileFormat : public avtMTSDFileFormat
/** subset contract information */
std::vector<avtDataSelection_p> selList;
std::vector<bool> *selsApplied;
float min[3]; /**< minimums for {x,y,z} dimensions */
float max[3]; /**< maximums for {x,y,z} dimensions */
double min[3]; /**< minimums for {x,y,z} dimensions */
double max[3]; /**< maximums for {x,y,z} dimensions */
bool restricted; /**< should we obey min[],max[]? */
private:
......
......@@ -56,7 +56,7 @@ float ***ggcm_field_matrix(const MHDdata * data, int nx, int ny, int nz,
}
/** alias for ggcm_field_matrix */
__deprecated float ***ggcmFieldMatrix(const MHDdata *data,
ggcm__deprecated float ***ggcmFieldMatrix(const MHDdata *data,
int nx, int ny, int nz,
char field_name[128]) {
return ggcm_field_matrix(data, nx, ny, nz, field_name);
......
......@@ -29,6 +29,6 @@ float *ggcm_grid(MHDdata *data, int *ndim, char * const grid_name)
}
/** alias for ggcm_grid */
__deprecated float *ggcmGrid(MHDdata *data, int *ndim, char * const grid_name) {
ggcm__deprecated float *ggcmGrid(MHDdata *data, int *ndim, char * const grid_name) {
return ggcm_grid(data, ndim, grid_name);
}
......@@ -17,7 +17,7 @@ void ggcm_grid_gse(float *xg, float *yg, float *zg,
}
/** alias for ggcm_grid_gse */
__deprecated void ggcmGridGSE(float *xg, float *yg, float *zg,
ggcm__deprecated void ggcmGridGSE(float *xg, float *yg, float *zg,
float *x_gse, float *y_gse, float *z_gse,
const int nx, const int ny, const int nz) {
ggcm_grid_gse(xg, yg, zg, x_gse, y_gse, z_gse, nx, ny, nz);
......
......@@ -50,7 +50,7 @@ void ggcm_mhd_gse(float ***fg, float ***fg_gse, int nx, int ny, int nz,
}
/** alias for ggcm_mhd_gse */
__deprecated void ggcmMHDGSE(float ***fg, float ***fg_gse,
ggcm__deprecated void ggcmMHDGSE(float ***fg, float ***fg_gse,
int nx, int ny, int nz,
char field_name[128]) {
ggcm_mhd_gse(fg, fg_gse, nx, ny, nz, field_name);
......
......@@ -4,9 +4,9 @@
#include <stdio.h>
#if __GNUC__ >= 3
# define __deprecated __attribute__ ((deprecated))
# define ggcm__deprecated __attribute__ ((deprecated))
#else
# define __deprecated /* no deprecated */
# define ggcm__deprecated /* no deprecated */
#endif
#ifdef __cplusplus
......@@ -72,7 +72,7 @@ typedef struct MHDdata_st {
/** initialize an MHDdata record */
void ggcm_init_mhd(MHDdata *data);
/** initialize an MHDdata record */
__deprecated void initMHD(MHDdata *data);
ggcm__deprecated void initMHD(MHDdata *data);
/** ggcm_read_mhd reads all the wrn ASCII-encoded MHD data requested
* by the "field_list[]" character array from the file specified by the
......@@ -89,7 +89,7 @@ MHDdata *ggcm_read_mhd(const char *file_name, const char *field_list[]);
* first structure of the list is returned. The order of the list is
* the order the data fields were found in the file -- not necessarily
* the order they were specified in the "field_list" array. */
__deprecated MHDdata *readMHDFile(const char *file_name,
ggcm__deprecated MHDdata *readMHDFile(const char *file_name,
const char *field_list[], long file_start);
/** creates a list which contains all of the metadata for a given GGCM file,
......@@ -102,12 +102,12 @@ MHDdata *ggcm_read_metadata(const char *filename);
void ggcm_free_data(MHDdata *);
/** traverses the MHDdata structure, deleting 'data' as it goes. stop when it
* encounters a NULL pointer. Finally, free()s the pointer to the structure. */
__deprecated void freeMHDData(MHDdata *md);
ggcm__deprecated void freeMHDData(MHDdata *md);
/** matrix [de]allocation routines */
__deprecated float ***matrixAllocate(int l, int m, int n);
__deprecated void matrixFree(float ***A, int l, int m, int n);
ggcm__deprecated float ***matrixAllocate(int l, int m, int n);
ggcm__deprecated void matrixFree(float ***A, int l, int m, int n);
/** allocates a matrix with the specified number of dimensions */
float ***m_alloc(unsigned int x, unsigned int y, unsigned int z);
......@@ -117,7 +117,7 @@ void m_free(float ***M);
/** create a GGCM grid array */
float *ggcm_grid(MHDdata *data, int *ndim, char * const grid_name);
/** create a GGCM grid array */
__deprecated float *ggcmGrid(MHDdata *data, int *ndim, char * const grid_name);
ggcm__deprecated float *ggcmGrid(MHDdata *data, int *ndim, char * const grid_name);
/** Our fields are stored in an MHDdata record, in no particular order
* (actually it depends on the input order, which we don't rely on). This
......@@ -130,7 +130,7 @@ float *ggcm_field(MHDdata * data, int nx, int ny, int nz,
float ***ggcm_field_matrix(const MHDdata * data, int nx, int ny, int nz,
char field_name[128]);
/** Create a 3D GGCM MHD field matrix */
__deprecated float ***ggcmFieldMatrix(const MHDdata *data,
ggcm__deprecated float ***ggcmFieldMatrix(const MHDdata *data,
int nx, int ny, int nz,
char field_name[128]);
......@@ -139,7 +139,7 @@ void ggcm_grid_gse(float *xg, float *yg, float *zg,
float *x_gse, float *y_gse, float *z_gse,
const int nx, const int ny, const int nz);
/** Convert 1D grid arrays from MHD to GSE coordinates */
__deprecated void ggcmGridGSE(float *xg, float *yg, float *zg,
ggcm__deprecated void ggcmGridGSE(float *xg, float *yg, float *zg,
float *x_gse, float *y_gse, float *z_gse,
const int nx, const int ny, const int nz);
......@@ -147,7 +147,7 @@ __deprecated void ggcmGridGSE(float *xg, float *yg, float *zg,
void ggcm_mhd_gse(float ***fg, float ***fg_gse, int nx, int ny, int nz,
char field_name[128]);
/** Convert 3D GGCM field matrices from MHD to GSE coordinates */
__deprecated void ggcmMHDGSE(float ***fg, float ***fg_gse,
ggcm__deprecated void ggcmMHDGSE(float ***fg, float ***fg_gse,
int nx, int ny, int nz,
char field_name[128]);
......
......@@ -8,7 +8,7 @@
#include <math.h>
/* these should be fixed to have more graceful error handling. */
__deprecated float ***matrixAllocate(int l, int m, int n)
ggcm__deprecated float ***matrixAllocate(int l, int m, int n)
{
int i, j;
float ***A;
......@@ -37,7 +37,7 @@ __deprecated float ***matrixAllocate(int l, int m, int n)
return A;
}
__deprecated void matrixFree(float ***A, int l, int m, int n)
ggcm__deprecated void matrixFree(float ***A, int l, int m, int n)
{
int i, j;
......
Markdown is supported
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