Commit 7499c823 authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

removed unused variable func

parent b5eaacac
......@@ -4,7 +4,7 @@
2010-11-08 Uwe Schulzweida <Uwe.Schulzweida@zmaw.de>
* sethalo: added support grid units radian
* sethalo: added support for grid units radian
* sethalo: correct lower bound of grid bounds for negative halos (bug fix)
* fldmean: gives wrong result for grid units radian (bug fix) [report: Pilar Ripodas]
......
......@@ -45,7 +45,6 @@ enum {CONSECSUM, CONSECTS};
static void selEndOfPeriod(field_t *periods, field_t history, field_t current, int isLastTimestep)
{
static const char *func = "selEndOfPeriod";
long i, len;
double pmissval = periods->missval;
double *parray = periods->ptr;
......@@ -56,7 +55,7 @@ static void selEndOfPeriod(field_t *periods, field_t history, field_t current, i
len = gridInqSize(periods->grid);
if ( len != gridInqSize(current.grid) || (gridInqSize(current.grid) != gridInqSize(history.grid)) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if (!isLastTimestep)
{
......@@ -127,9 +126,7 @@ static void selEndOfPeriod(field_t *periods, field_t history, field_t current, i
void *Consecstat (void *argument)
{
static const char *func = "Consecstat";
int operatorID;
int i;
int istreamID, itaxisID, ivlistID, itsID;
int ostreamID, otaxisID, ovlistID, otsID;
......@@ -232,7 +229,7 @@ void *Consecstat (void *argument)
}
break;
default:
printf (SWITCHWARN,func);
printf (SWITCHWARN,__func__);
}
for ( recID = 0; recID < nrecs; recID++ )
......@@ -266,7 +263,7 @@ void *Consecstat (void *argument)
#endif
break;
default:
printf (SWITCHWARN,func);
printf (SWITCHWARN,__func__);
}
}
histvdate = vdate;
......
......@@ -42,7 +42,6 @@ enum T_EIGEN_MODE {JACOBI, DANIELSON_LANCZOS};
void *EOFs(void * argument)
{
static const char *func = "EOFs";
char *envstr;
enum {EOF_, EOF_TIME, EOF_SPATIAL};
......@@ -530,9 +529,9 @@ void *EOFs(void * argument)
if ( eigen_mode == JACOBI )
// TODO: use return status (>0 okay, -1 did not converge at all)
parallel_eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,func);
parallel_eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,__func__);
else
eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,func);
eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,__func__);
if ( cdoTimer ) timer_stop(timer_eig);
/* NOW: cov contains the eigenvectors, eigv the eigenvalues */
......
......@@ -648,7 +648,6 @@ void read_gg3d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxis
static
void read_fc4d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxisID, int nhgl, int nmp1)
{
static const char *func = "read_fc4d";
int nlev, nfc, i;
int gridtype, zaxistype;
int nc_var_id;
......@@ -662,7 +661,7 @@ void read_fc4d(int nc_file_id, const char *name, VAR *var, int gridID, int zaxis
nfc = gridInqSize(gridID);
nlev = zaxisInqSize(zaxisID);
if ( nfc != nhgl*nmp1*2 ) cdoAbort("%s: inconsistent dimension length!", func);
if ( nfc != nhgl*nmp1*2 ) cdoAbort("%s: inconsistent dimension length!", __func__);
var->gridID = gridID;
var->zaxisID = zaxisID;
......
......@@ -45,7 +45,6 @@ enum T_EIGEN_MODE {JACOBI, DANIELSON_LANCZOS};
void *EOF3d(void * argument)
{
static const char *func = "EOFs";
char *envstr;
enum {EOF3D_, EOF3D_TIME, EOF3D_SPATIAL};
......@@ -424,9 +423,9 @@ void *EOF3d(void * argument)
cdoPrint("Processed correlation matrix for var %2i | npack: %4i",varID,n);
if ( eigen_mode == JACOBI )
parallel_eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,func);
parallel_eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,__func__);
else
eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,func);
eigen_solution_of_symmetric_matrix(&cov[0],&eigv[0],n,n,__func__);
/* NOW: cov contains the eigenvectors, eigv the eigenvalues */
if ( cdoVerbose )
......
......@@ -48,7 +48,6 @@ static double humidityIndex(double t, double e, double r, double missval)
static void farexpr(field_t *field1, field_t field2, field_t field3, double (*expression)(double, double, double, double))
{
static const char *func = "farexpr";
int i, len;
const int grid1 = field1->grid;
const int nmiss1 = field1->nmiss;
......@@ -66,7 +65,7 @@ static void farexpr(field_t *field1, field_t field2, field_t field3, double (*ex
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) || len != gridInqSize(grid3) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 || nmiss3 > 0 )
{
......
......@@ -29,7 +29,6 @@
void *Splitrec(void *argument)
{
static const char *func = "Splitrec";
int nchars;
int streamID1, streamID2;
int varID;
......
......@@ -29,8 +29,6 @@
void *Splitsel(void *argument)
{
static const char *func = "Splitsel";
/* from Selstat.c */
int operatorID;
int operfunc;
......
......@@ -36,7 +36,6 @@
void *Timstat3(void *argument)
{
static const char *func = "Timstat3";
int VARQUOT2TEST, MEANDIFF2TEST;
int operatorID;
int streamID[NIN], streamID3;
......@@ -245,7 +244,7 @@ void *Timstat3(void *argument)
else
beta_distr_constants((fnvals0 - 1) / 2,
(fnvals1 - 1) / 2, 1 - risk,
&fractil_1, &fractil_2, func);
&fractil_1, &fractil_2, __func__);
out[0].ptr[i] = DBL_IS_EQUAL(statistic, missval1) ? missval1 :
statistic <= fractil_1 || statistic >= fractil_2 ? 1 : 0;
}
......@@ -300,7 +299,7 @@ void *Timstat3(void *argument)
temp2 = DIV(DIV(mean_estimator, norm), stddev_estimator);
fractil = deg_of_freedom < 1 ? missval1 :
student_t_inv (deg_of_freedom, 1 - risk/2, func);
student_t_inv (deg_of_freedom, 1 - risk/2, __func__);
out[0].ptr[i] = DBL_IS_EQUAL(temp2, missval1)|| DBL_IS_EQUAL(fractil, missval1) ?
missval1 : fabs(temp2) >= fractil;
......
......@@ -45,7 +45,6 @@ static double windchillTemperature(double t, double ff, double missval)
static void farexpr(field_t *field1, field_t field2, double (*expression)(double, double, double))
{
static const char *func = "farexpr";
int i, len;
const int grid1 = field1->grid;
const int nmiss1 = field1->nmiss;
......@@ -59,7 +58,7 @@ static void farexpr(field_t *field1, field_t field2, double (*expression)(double
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......
......@@ -157,7 +157,6 @@ void cptInit(CPT *cpt)
int cptRead(FILE *fp, CPT *cpt)
{
static const char *func = "cptRead";
int ncolors;
int status = 0;
/* Opens and reads a color palette file in RGB, HSV, or CMYK of arbitrary length */
......@@ -189,7 +188,7 @@ int cptRead(FILE *fp, CPT *cpt)
color_model = CMYK;
else
{
fprintf (stderr, "%s: unrecognized COLOR_MODEL\n", func);
fprintf (stderr, "%s: unrecognized COLOR_MODEL\n", __func__);
return (READERR);
}
}
......@@ -217,7 +216,7 @@ int cptRead(FILE *fp, CPT *cpt)
cpt->bfn[id].skip = FALSE;
if ((nread = sscanf (&line[2], "%s %s %s %s", T1, T2, T3, T4)) < 1) error = TRUE;
if (T1[0] == 'p' || T1[0] == 'P') { /* Gave a pattern */
fprintf (stderr, "%s: CPT Pattern fill (%s) unsupported!\n", func, T1);
fprintf (stderr, "%s: CPT Pattern fill (%s) unsupported!\n", __func__, T1);
return (READERR);
}
else { /* Shades, RGB, HSV, or CMYK */
......@@ -273,7 +272,7 @@ int cptRead(FILE *fp, CPT *cpt)
cpt->lut[n].skip = FALSE;
if (T1[0] == '-') { /* Skip this slice */
if (nread != 4) {
fprintf (stderr, "%s: z-slice to skip not in [z0 - z1 -] format!\n", func);
fprintf (stderr, "%s: z-slice to skip not in [z0 - z1 -] format!\n", __func__);
return (READERR);
}
cpt->lut[n].z_high = atof (T2);
......@@ -281,7 +280,7 @@ int cptRead(FILE *fp, CPT *cpt)
for (i = 0; i < 3; i++) cpt->lut[n].rgb_low[i] = cpt->lut[n].rgb_high[i] = 255; /* If you must, use page color */
}
else if (T1[0] == 'p' || T1[0] == 'P') { /* Gave pattern fill */
fprintf (stderr, "%s: CPT Pattern fill (%s) unsupported!\n", func, T1);
fprintf (stderr, "%s: CPT Pattern fill (%s) unsupported!\n", __func__, T1);
return (READERR);
}
else { /* Shades, RGB, HSV, or CMYK */
......@@ -308,7 +307,7 @@ int cptRead(FILE *fp, CPT *cpt)
dz = cpt->lut[n].z_high - cpt->lut[n].z_low;
if ( !(fabs(dz) > 0) ) {
fprintf (stderr, "%s: Z-slice with dz = 0\n", func);
fprintf (stderr, "%s: Z-slice with dz = 0\n", __func__);
return (READERR);
}
cpt->lut[n].i_dz = 1.0 / dz;
......@@ -330,13 +329,13 @@ int cptRead(FILE *fp, CPT *cpt)
if ( error )
{
fprintf (stderr, "%s: Decoding error\n", func);
fprintf (stderr, "%s: Decoding error\n", __func__);
return (READERR);
}
if ( n == 0 )
{
fprintf (stderr, "%s: CPT file has no z-slices!\n", func);
fprintf (stderr, "%s: CPT file has no z-slices!\n", __func__);
return (READERR);
}
......@@ -350,7 +349,7 @@ int cptRead(FILE *fp, CPT *cpt)
annot += cpt->lut[i].annot;
if ( gap )
{
fprintf (stderr, "%s: Color palette table has gaps - aborts!\n", func);
fprintf (stderr, "%s: Color palette table has gaps - aborts!\n", __func__);
return (READERR);
}
......
......@@ -147,7 +147,6 @@ unsigned long day_of_year(int date)
*/
static void count(field_t *field1, const field_t *field2, double mode)
{
static const char *func = "count";
int i, len;
const int grid1 = field1->grid;
const int nmiss1 = field1->nmiss;
......@@ -160,7 +159,7 @@ static void count(field_t *field1, const field_t *field2, double mode)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 )
{
......@@ -232,7 +231,6 @@ static void count(field_t *field1, const field_t *field2, double mode)
*/
static void selcomp(field_t *field1, const field_t *field2, int (*compare)(double, double))
{
static const char *func = "selcomp";
int i, len;
const int grid1 = field1->grid;
const int nmiss1 = field1->nmiss;
......@@ -246,7 +244,7 @@ static void selcomp(field_t *field1, const field_t *field2, int (*compare)(doubl
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -372,7 +370,6 @@ void farnum3(field_t *field1, field_t field2, double n)
void farsel(field_t *field1, field_t field2)
{
static const char *func = "farsel";
int i, len;
const int grid1 = field1->grid;
const double missval1 = field1->missval;
......@@ -385,7 +382,7 @@ void farsel(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss2 > 0 )
{
......
......@@ -49,7 +49,6 @@ static int NumFunc = sizeof(fun_sym_tbl) / sizeof(fun_sym_tbl[0]);
static
nodeType *expr_con_con(int oper, nodeType *p1, nodeType *p2)
{
static const char *func = "expr_con_con";
nodeType *p;
p = (nodeType *) malloc(sizeof(nodeType));
......@@ -63,7 +62,7 @@ nodeType *expr_con_con(int oper, nodeType *p1, nodeType *p2)
case '*': p->u.con.value = p1->u.con.value * p2->u.con.value; break;
case '/': p->u.con.value = p1->u.con.value / p2->u.con.value; break;
case '^': p->u.con.value = pow(p1->u.con.value, p2->u.con.value); break;
default: cdoAbort("%s: operator %c unsupported!", func, oper);
default: cdoAbort("%s: operator %c unsupported!", __func__, oper);
}
return (p);
......@@ -72,7 +71,6 @@ nodeType *expr_con_con(int oper, nodeType *p1, nodeType *p2)
static
nodeType *expr_con_var(int oper, nodeType *p1, nodeType *p2)
{
static const char *func = "expr_con_var";
nodeType *p;
long ngp, i;
long nlev;
......@@ -157,7 +155,7 @@ nodeType *expr_con_var(int oper, nodeType *p1, nodeType *p2)
}
break;
default:
cdoAbort("%s: operator %c unsupported!", func, oper);
cdoAbort("%s: operator %c unsupported!", __func__, oper);
}
nmiss = 0;
......@@ -174,7 +172,6 @@ nodeType *expr_con_var(int oper, nodeType *p1, nodeType *p2)
static
nodeType *expr_var_con(int oper, nodeType *p1, nodeType *p2)
{
static const char *func = "expr_var_con";
nodeType *p;
long ngp, i;
long nlev;
......@@ -265,7 +262,7 @@ nodeType *expr_var_con(int oper, nodeType *p1, nodeType *p2)
}
break;
default:
cdoAbort("%s: operator %c unsupported!", func, oper);
cdoAbort("%s: operator %c unsupported!", __func__, oper);
}
nmiss = 0;
......@@ -282,7 +279,6 @@ nodeType *expr_var_con(int oper, nodeType *p1, nodeType *p2)
static
nodeType *expr_var_var(int oper, nodeType *p1, nodeType *p2)
{
static const char *func = "expr_var_var";
nodeType *p;
long ngp, ngp1, ngp2, i;
long nlev, nlev1, nlev2, k;
......@@ -409,7 +405,7 @@ nodeType *expr_var_var(int oper, nodeType *p1, nodeType *p2)
}
break;
default:
cdoAbort("%s: operator %c unsupported!", func, oper);
cdoAbort("%s: operator %c unsupported!", __func__, oper);
}
}
......
......@@ -38,7 +38,6 @@ void farfun(field_t *field1, field_t field2, int function)
void faradd(field_t *field1, field_t field2)
{
static const char *func = "faradd";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -53,7 +52,7 @@ void faradd(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -79,7 +78,6 @@ void faradd(field_t *field1, field_t field2)
void farsum(field_t *field1, field_t field2)
{
static const char *func = "farsum";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -94,7 +92,7 @@ void farsum(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -129,7 +127,6 @@ void farsum(field_t *field1, field_t field2)
*/
void farsumtr(field_t *occur, field_t field, double refval)
{
static const char *func = "farsumtr";
long i, len;
double omissval = occur->missval;
double *oarray = occur->ptr;
......@@ -138,7 +135,7 @@ void farsumtr(field_t *occur, field_t field, double refval)
len = gridInqSize(occur->grid);
if ( len != gridInqSize(field.grid) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( occur->nmiss > 0 || field.nmiss > 0 )
{
......@@ -176,7 +173,6 @@ void farsumtr(field_t *occur, field_t field, double refval)
void farsumq(field_t *field1, field_t field2)
{
static const char *func = "farsumq";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -191,7 +187,7 @@ void farsumq(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -218,7 +214,6 @@ void farsumq(field_t *field1, field_t field2)
void farsub(field_t *field1, field_t field2)
{
static const char *func = "farsub";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -232,7 +227,7 @@ void farsub(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -253,7 +248,6 @@ void farsub(field_t *field1, field_t field2)
void farmul(field_t *field1, field_t field2)
{
static const char *func = "farmul";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -267,7 +261,7 @@ void farmul(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -288,7 +282,6 @@ void farmul(field_t *field1, field_t field2)
void fardiv(field_t *field1, field_t field2)
{
static const char *func = "fardiv";
long i, len;
int grid1 = field1->grid;
double missval1 = field1->missval;
......@@ -300,7 +293,7 @@ void fardiv(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
for ( i = 0; i < len; i++ )
array1[i] = DIV(array1[i], array2[i]);
......@@ -313,7 +306,6 @@ void fardiv(field_t *field1, field_t field2)
void faratan2(field_t *field1, field_t field2)
{
static const char *func = "fardiv";
long i, len;
int grid1 = field1->grid;
double missval1 = field1->missval;
......@@ -325,7 +317,7 @@ void faratan2(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
for ( i = 0; i < len; i++ )
array1[i] = DBL_IS_EQUAL(array1[i],missval1) || DBL_IS_EQUAL(array2[i],missval2) ? missval1 : atan2(array1[i], array2[i]);
......@@ -338,7 +330,6 @@ void faratan2(field_t *field1, field_t field2)
void farmin(field_t *field1, field_t field2)
{
static const char *func = "farmin";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -352,7 +343,7 @@ void farmin(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -377,7 +368,6 @@ void farmin(field_t *field1, field_t field2)
void farmax(field_t *field1, field_t field2)
{
static const char *func = "farmax";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -391,7 +381,7 @@ void farmax(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -416,7 +406,6 @@ void farmax(field_t *field1, field_t field2)
void farvar(field_t *field1, field_t field2, field_t field3)
{
static const char *func = "farvar";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -431,7 +420,7 @@ void farvar(field_t *field1, field_t field2, field_t field3)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -465,7 +454,6 @@ void farvar(field_t *field1, field_t field2, field_t field3)
void farstd(field_t *field1, field_t field2, field_t field3)
{
static const char *func = "farstd";
long i, len;
int grid1 = field1->grid;
double missval1 = field1->missval;
......@@ -475,7 +463,7 @@ void farstd(field_t *field1, field_t field2, field_t field3)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
farvar(field1, field2, field3);
......@@ -495,7 +483,6 @@ void farstd(field_t *field1, field_t field2, field_t field3)
void farcvar(field_t *field1, field_t field2, double rconst1)
{
static const char *func = "farcvar";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -509,7 +496,7 @@ void farcvar(field_t *field1, field_t field2, double rconst1)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......@@ -543,7 +530,6 @@ void farcvar(field_t *field1, field_t field2, double rconst1)
void farcstd(field_t *field1, field_t field2, double rconst1)
{
static const char *func = "farcstd";
long i, len;
int grid1 = field1->grid;
double missval1 = field1->missval;
......@@ -553,7 +539,7 @@ void farcstd(field_t *field1, field_t field2, double rconst1)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
farcvar(field1, field2, rconst1);
......@@ -573,7 +559,6 @@ void farcstd(field_t *field1, field_t field2, double rconst1)
void farmoq(field_t *field1, field_t field2)
{
static const char *func = "farmoq";
long i, len;
int grid1 = field1->grid;
double missval1 = field1->missval;
......@@ -586,7 +571,7 @@ void farmoq(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss2 > 0 )
{
......@@ -624,7 +609,6 @@ void farmoq(field_t *field1, field_t field2)
*/
void farcount(field_t *field1, field_t field2)
{
static const char *func = "farcount";
long i, len;
int grid1 = field1->grid;
int nmiss1 = field1->nmiss;
......@@ -639,7 +623,7 @@ void farcount(field_t *field1, field_t field2)
len = gridInqSize(grid1);
if ( len != gridInqSize(grid2) )
cdoAbort("Fields have different gridsize (%s)", func);
cdoAbort("Fields have different gridsize (%s)", __func__);
if ( nmiss1 > 0 || nmiss2 > 0 )
{
......