Ensstat: removed test code.

src/Ensstat.cc

@@ -132,8 +132,7 @@ void *ensstat_func(void *ensarg)
   return NULL;
 }
 
-//#define TEST_TASK
-#ifdef TEST_TASK
+
 void *Ensstat(void *argument)
 {
   void *task = CDO_task ? cdo_task_new() : NULL;
@@ -322,7 +321,7 @@ void *Ensstat(void *argument)
             {
               cdo_task_start(task, ensstat_func, &ensstat_arg);
               cdo_task_wait(task);
-              t = !t;
+              //  t = !t;
             }
           else
             {
@@ -339,8 +338,6 @@ void *Ensstat(void *argument)
   if ( lwarning ) cdoWarning("Inconsistent ensemble, processed only the first %d timesteps!", tsID);
   if ( lerror ) cdoAbort("Inconsistent ensemble, processed only the first %d timesteps!", tsID);
 
-  if ( task ) cdo_task_wait(task);
-
   for ( int fileID = 0; fileID < nfiles; fileID++ )
     pstreamClose(ef[fileID].streamID);
 
@@ -365,231 +362,3 @@ void *Ensstat(void *argument)
 
   return 0;
 }
-#else
-void *Ensstat(void *argument)
-{
-  void *task = CDO_task ? cdo_task_new() : NULL;
-  ensstat_arg_t ensstat_arg;
-  int nrecs0;
-
-  cdoInitialize(argument);
-
-  cdoOperatorAdd("ensrange", func_range, 0, NULL);
-  cdoOperatorAdd("ensmin",   func_min,   0, NULL);
-  cdoOperatorAdd("ensmax",   func_max,   0, NULL);
-  cdoOperatorAdd("enssum",   func_sum,   0, NULL);
-  cdoOperatorAdd("ensmean",  func_mean,  0, NULL);
-  cdoOperatorAdd("ensavg",   func_avg,   0, NULL);
-  cdoOperatorAdd("ensstd",   func_std,   0, NULL);
-  cdoOperatorAdd("ensstd1",  func_std1,  0, NULL);
-  cdoOperatorAdd("ensvar",   func_var,   0, NULL);
-  cdoOperatorAdd("ensvar1",  func_var1,  0, NULL);
-  cdoOperatorAdd("enspctl",  func_pctl,  0, NULL);
-
-  int operatorID = cdoOperatorID();
-  int operfunc = cdoOperatorF1(operatorID);
-
-  bool lpctl = operfunc == func_pctl;
-
-  int argc = operatorArgc();
-  int nargc = argc;
-
-  double pn = 0;
-  if ( operfunc == func_pctl )
-    {
-      operatorInputArg("percentile number");
-      pn = parameter2int(operatorArgv()[0]);
-      percentile_check_number(pn);
-      argc--;
-    }
-
-  bool count_data = false;
-  if ( argc == 1 )
-    {
-      if ( strcmp("count", operatorArgv()[nargc-1]) == 0 ) count_data = true;
-      else cdoAbort("Unknown parameter: >%s<", operatorArgv()[nargc-1]); 
-    }
-    
-  int nfiles = cdoStreamCnt() - 1;
-
-  if ( cdoVerbose ) cdoPrint("Ensemble over %d files.", nfiles);
-
-  const char *ofilename = cdoStreamName(nfiles)->args;
-
-  if ( !cdoOverwriteMode && fileExists(ofilename) && !userFileOverwrite(ofilename) )
-    cdoAbort("Outputfile %s already exists!", ofilename);
-
-  ens_file_t *ef = (ens_file_t *) Malloc(nfiles*sizeof(ens_file_t));
-
-  field_type *field = (field_type *) Malloc(ompNumThreads*sizeof(field_type));
-  for ( int i = 0; i < ompNumThreads; i++ )
-    {
-      field_init(&field[i]);
-      field[i].size = nfiles;
-      field[i].ptr  = (double*) Malloc(nfiles*sizeof(double));
-    }
-
-  for ( int fileID = 0; fileID < nfiles; fileID++ )
-    {
-      ef[fileID].streamID = pstreamOpenRead(cdoStreamName(fileID));
-      ef[fileID].vlistID  = pstreamInqVlist(ef[fileID].streamID);
-    }
-
-  /* check that the contents is always the same */
-  for ( int fileID = 1; fileID < nfiles; fileID++ )
-    vlistCompare(ef[0].vlistID, ef[fileID].vlistID, CMP_ALL);
-
-  int vlistID1 = ef[0].vlistID;
-  int vlistID2 = vlistDuplicate(vlistID1);
-  int taxisID1 = vlistInqTaxis(vlistID1);
-  int taxisID2 = taxisDuplicate(taxisID1);
-  vlistDefTaxis(vlistID2, taxisID2);
-
-  int gridsizemax = vlistGridsizeMax(vlistID1);
-
-  for ( int fileID = 0; fileID < nfiles; fileID++ )
-    {
-      ef[fileID].array[0] = (double*) Malloc(gridsizemax*sizeof(double));
-      ef[fileID].array[1] = task ? (double*) Malloc(gridsizemax*sizeof(double)) : NULL;
-    }
-
-  double *array2 = (double *) Malloc(gridsizemax*sizeof(double));
-
-  int nvars = vlistNvars(vlistID2);
-  double *count2 = NULL;
-  if ( count_data )
-    {
-      count2 = (double *) Malloc(gridsizemax*sizeof(double));
-      for ( int varID = 0; varID < nvars; ++varID )
-	{
-	  char name[CDI_MAX_NAME];
-	  vlistInqVarName(vlistID2, varID, name);
-	  strcat(name, "_count");
-	  int gridID = vlistInqVarGrid(vlistID2, varID);
-	  int zaxisID = vlistInqVarZaxis(vlistID2, varID);
-	  int tsteptype = vlistInqVarTsteptype(vlistID2, varID);
-	  int cvarID = vlistDefVar(vlistID2, gridID, zaxisID, tsteptype);
-	  vlistDefVarName(vlistID2, cvarID, name);
-	  vlistDefVarDatatype(vlistID2, cvarID, CDI_DATATYPE_INT16);
-	  if ( cvarID != (varID+nvars) ) cdoAbort("Internal error, varIDs do not match!");
-	}
-    }
-
-  int streamID2 = pstreamOpenWrite(cdoStreamName(nfiles), cdoFiletype());
-  pstreamDefVlist(streamID2, vlistID2);
-
-  ensstat_arg.vlistID1 = vlistID1;
-  ensstat_arg.streamID2 = streamID2;
-  ensstat_arg.nfiles = nfiles;
-  ensstat_arg.array2 = array2;
-  ensstat_arg.count2 = count2;
-  ensstat_arg.field = field;
-  ensstat_arg.operfunc = operfunc;
-  ensstat_arg.pn = pn;
-  ensstat_arg.lpctl = lpctl;
-  ensstat_arg.count_data = count_data;
-  ensstat_arg.nvars = nvars;
-  ensstat_arg.t = 0;
-
-  bool lwarning = false;
-  bool lerror = false;
-  int t = 0;
-  int tsID = 0;
-  do
-    {
-      nrecs0 = pstreamInqTimestep(ef[0].streamID, tsID);
-      for ( int fileID = 1; fileID < nfiles; fileID++ )
-	{
-	  int streamID = ef[fileID].streamID;
-	  int nrecs = pstreamInqTimestep(streamID, tsID);
-	  if ( nrecs != nrecs0 )
-	    {
-	      if ( nrecs == 0 )
-                {
-                  lwarning = true;
-                  cdoWarning("Inconsistent ensemble file, too few time steps in %s!", cdoStreamName(fileID)->args);
-                }
-	      else if ( nrecs0 == 0 )
-                {
-                  lwarning = true;
-                  cdoWarning("Inconsistent ensemble file, too few time steps in %s!", cdoStreamName(0)->args);
-                }
-	      else
-                {
-                  lerror = true;
-                  cdoWarning("Inconsistent ensemble file, number of records at time step %d of %s and %s differ!",
-                             tsID+1, cdoStreamName(0)->args, cdoStreamName(fileID)->args);
-                }
-              goto CLEANUP;
-	    }
-	}
-
-      if ( nrecs0 > 0 )
-	{
-	  taxisCopyTimestep(taxisID2, taxisID1);
-	  pstreamDefTimestep(streamID2, tsID);
-	}
-
-      for ( int recID = 0; recID < nrecs0; recID++ )
-	{
-          int varID = 0, levelID;
-
-	  for ( int fileID = 0; fileID < nfiles; fileID++ )
-	    {
-	      pstreamInqRecord(ef[fileID].streamID, &varID, &levelID);
-              ef[fileID].missval[t] = vlistInqVarMissval(ef[fileID].vlistID, varID);
-	    }
-          //#pragma omp parallel for default(none) shared(ef, nfiles)
-	  for ( int fileID = 0; fileID < nfiles; fileID++ )
-	    {
-	      pstreamReadRecord(ef[fileID].streamID, ef[fileID].array[t], &ef[fileID].nmiss[t]);
-	    }
-
-          ensstat_arg.ef = ef;
-          ensstat_arg.varID[t] = varID;
-          ensstat_arg.levelID[t] = levelID;
-          if ( task )
-            {
-              cdo_task_start(task, ensstat_func, &ensstat_arg);
-              cdo_task_wait(task);
-            }
-          else
-            {
-              ensstat_func(&ensstat_arg);
-            }
-        }
-
-      tsID++;
-    }
-  while ( nrecs0 > 0 );
-
- CLEANUP:
-
-  if ( lwarning ) cdoWarning("Inconsistent ensemble, processed only the first %d timesteps!", tsID);
-  if ( lerror ) cdoAbort("Inconsistent ensemble, processed only the first %d timesteps!", tsID);
-
-  for ( int fileID = 0; fileID < nfiles; fileID++ )
-    pstreamClose(ef[fileID].streamID);
-
-  pstreamClose(streamID2);
-
-  for ( int fileID = 0; fileID < nfiles; fileID++ )
-    {
-      if ( ef[fileID].array[0] ) Free(ef[fileID].array[0]);
-      if ( ef[fileID].array[1] ) Free(ef[fileID].array[1]);
-    }
-
-  if ( ef ) Free(ef);
-  if ( array2 ) Free(array2);
-  if ( count2 ) Free(count2);
-
-  for ( int i = 0; i < ompNumThreads; i++ ) if ( field[i].ptr ) Free(field[i].ptr);
-  if ( field ) Free(field);
-
-  if ( task ) cdo_task_delete(task);
-
-  cdoFinish();
-
-  return 0;
-}
-#endif