start working at mapreduce

.gitattributes

@@ -417,7 +417,6 @@ src/Magplot.c -text
 src/Magvector.c -text
 src/Makefile.am -text
 src/Makefile.in -text
-src/MapRecuce.c -text
 src/MapReduce.c -text
 src/Maskbox.c -text
 src/Mastrfu.c -text

src/MapRecuce.c

-/*
-  This file is part of CDO. CDO is a collection of Operators to
-  manipulate and analyse Climate model Data.
-
-  Copyright (C) 2003-2016 Uwe Schulzweida, <uwe.schulzweida AT mpimet.mpg.de>
-  See COPYING file for copying and redistribution conditions.
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; version 2 of the License.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
-*/
-
-/*
-   This module contains the following operators:
-
-      Pack      reduce
-      Pack    unreduce
-*/
-
-#if defined(_OPENMP)
-#  include <omp.h>
-#endif
-
-#include <limits.h>
-
-#include <cdi.h>
-#include "cdo.h"
-#include "cdo_int.h"
-#include "pstream.h"
-
-void *MapReduce(void *argument)
-{
-  int gridsize;
-  int nrecs;
-  int gridID, varID, levelID, recID;
-  int i;
-  int nts;
-  int nalloc = 0;
-  int nmiss;
-  int nlevel;
-  int datatype = DATATYPE_INT16;
-  dtlist_type *dtlist = dtlist_new();
-  double missval1, missval2;
-  field_t ***vars = NULL;
-
-  cdoInitialize(argument);
-
-  int streamID1 = streamOpenRead(cdoStreamName(0));
-
-  int vlistID1 = streamInqVlist(streamID1);
-  int vlistID2 = vlistDuplicate(vlistID1);
-
-  int taxisID1 = vlistInqTaxis(vlistID1);
-  int taxisID2 = taxisDuplicate(taxisID1);
-  vlistDefTaxis(vlistID2, taxisID2);
-
-  int nvars = vlistNvars(vlistID1);
-
-  int tsID = 0;
-  while ( (nrecs = streamInqTimestep(streamID1, tsID)) )
-    {
-      tsID++;
-    }
-
-  int streamID2 = streamOpenWrite(cdoStreamName(1), cdoFiletype());
-
-  streamClose(streamID2);
-  streamClose(streamID1);
-
-  cdoFinish();
-
-  return 0;
-}

src/MapReduce.c

@@ -32,11 +32,63 @@
 #include "cdo.h"
 #include "cdo_int.h"
 #include "pstream.h"
+#include "grid.h"
 
+int matrix2vector(int i, int j, int Ni, int Nj)
+{
+  return i*Nj + j;
+}
+int *vector2matrix(int k, int Ni, int Nj)
+{
+  int *retval;
+  retval = (int *) malloc(2*sizeof(int));
+
+  retval[0] = k/Nj; retval[1] = k%Nj;
+  return retval;
+}
+
+/* count the number of locations, for which the mask is TRUE, i.e. has a
+ * non-zero value */
+int countMask(double *maskField, int gridSize, double falseVal)
+{
+  int counter;
+
+  counter = 0;
+
+  for (int i = 0; i < gridSize; i++)
+  {
+    if (!DBL_IS_EQUAL(maskField[i],falseVal)) counter += 1;
+  }
+  return counter;
+}
+
+/*
+ * collect the indices of relevant location out of the given mask
+ */
+void collectLocations(double *maskField, int gridSize, double falseVal, int *maskIndexList)
+{
+  int k = 0;
+  for (int i = 0; i < gridSize; i++)
+  {
+    if (!DBL_IS_EQUAL(maskField[i],falseVal))
+    {
+      maskIndexList[k] = i;
+      printf("sdfsdf:%d ",i);
+      k += 1;
+    }
+  }
+      printf(" k =%d ",k);
+}
+
+/*
+ * the operators argument has to be a single horizontal field,
+ * non-zero values are used to mark the relevant locations
+ */
 void *MapReduce(void *argument)
 {
   int gridsize;
   int nrecs;
+  int tsID;
   int gridID, varID, levelID, recID;
   int i;
   int nts;
@@ -51,17 +103,69 @@ void *MapReduce(void *argument)
   cdoInitialize(argument);
 
   int streamID1 = streamOpenRead(cdoStreamName(0));
+  int vlistID1  = streamInqVlist(streamID1);
+  int nvars     = vlistNvars(vlistID1);
+  int vlistID2  = vlistDuplicate(vlistID1);
+
+  /* check input grid type and size */
+  int inputGridID = cdoDefineGrid(operatorArgv()[0]);
+  int inputGridSize = gridInqSize(inputGridID);
+  if ( cdoVerbose ) cdoPrint("input gridSize:%d", inputGridSize);
+
+  /* search the number of relevant locations */
+  tsID = 0; nrecs = 0;
+  double *inputMaskField = (double*) Malloc(inputGridSize*sizeof(double));
+  streamReadRecord(streamID1, inputMaskField, &nmiss);
+  minmaxval(inputGridSize, inputMaskField, NULL,&missval1, &missval2);
+  cdoPrint("min: %g | max: %g ",missval1, missval2);
+  /* count points */
+  int maskSize = countMask(inputMaskField, inputGridSize, 0.0);
+  cdoPrint("maskSize = %d",maskSize);
+
+  /* collect the original coordinates */
+  int maskIndexList[maskSize];
+  for (int m = 0; m < maskSize; m++) maskIndexList[m] = -1;
+    cdoPrint("maskIndexList[%d] = %d",3,maskIndexList[3]);
+  /*
+  collectLocations(inputMaskField, inputGridSize, 0.0, &maskIndexList);
+
+  for (int l = 0; l < 1; l++)
+    cdoPrint("maskIndexList[%d] = %d",l,maskIndexList[l]);
+  */
+
+
+  /* create unstructured output grid */
+  int outputGridID = gridCreate(GRID_UNSTRUCTURED,maskSize);
+  gridDefXsize(outputGridID,maskSize);
+  gridDefYsize(outputGridID,maskSize);
+  double *xvals = (double*) Malloc(maskSize*sizeof(double));
+  double *yvals = (double*) Malloc(maskSize*sizeof(double));
+
+  /* start with lonlat grid intput */
+  int inputGridType = gridInqType(inputGridID);
+  if (GRID_LONLAT != inputGridType)
+  {
+    cdoPrint("Currenlty only LONLAT intput grds area supported!");
+    cdoFinish();
+  }
+
+  for (int i = 0; i < maskSize; i++) xvals[i] = 0.0;
+
+  gridDefXvals(outputGridID, xvals);
+  gridDefYvals(outputGridID, yvals);
 
-  int vlistID1 = streamInqVlist(streamID1);
-  int vlistID2 = vlistDuplicate(vlistID1);
+  Free(xvals);
+  Free(yvals);
+  Free(inputMaskField);
+  Free(maskIndexList);
 
+  /* copy time axis */
   int taxisID1 = vlistInqTaxis(vlistID1);
   int taxisID2 = taxisDuplicate(taxisID1);
   vlistDefTaxis(vlistID2, taxisID2);
 
-  int nvars = vlistNvars(vlistID1);
 
-  int tsID = 0;
+  tsID = 0;
   while ( (nrecs = streamInqTimestep(streamID1, tsID)) )
   {
     tsID++;