Added Ydayarith.cc and Ydayarith.cc

src/Makefile.am

@@ -315,6 +315,8 @@ cdo_SOURCES +=                  Adisit.cc            \
 				Showinfo.cc			 \
 				Showattribute.cc     \
 				Vargen.cc            \
+                                Yearmonstat.cc       \
+                                Ydayarith.cc         \
                                 Ymonarith.cc         \
                                 Yseaspctl.cc         \
                                 Yseasstat.cc         \

src/Ydayarith.cc

@@ -20,6 +20,7 @@
 #include "datetime.h"
 #include "process_int.h"
 #include "printinfo.h"
+#include "field_functions.h"
 
 static void
 add_operators(void)
@@ -111,7 +112,7 @@ Ydayarith(void *process)
         {
           int varID, levelID;
           cdo_inq_record(streamID1, &varID, &levelID);
-          field = FieldFactory::init(varList1[varID]);
+          field = FieldFactory::reInit(field, varList1[varID]);
           cdo_read_record(streamID1, field);
 
           field2_function(field, vars2[dayOfYear][varID][levelID], operfunc);

src/Yearmonstat.cc

@@ -20,6 +20,7 @@
 #include "process_int.h"
 #include "datetime.h"
 #include "printinfo.h"
+#include "field_functions.h"
 
 
 void *
@@ -128,22 +129,22 @@ Yearmonstat(void *process)
 
                   fieldc_mul(rvars1, dpm);
 
-                  if (rvars1.nmiss || !rsamp1.empty())
+                  if (rvars1.getNumMiss() || !rsamp1.empty())
                     {
-                      if (rsamp1.empty()) rsamp1.resize(rvars1.size);
+                      if (rsamp1.empty()) rsamp1.resize(rvars1.getSize());
                       field2_vinit(rsamp1, rvars1, dpm);
                     }
                 }
               else
                 {
-                  field = FieldFactory::init(varList[varID]);
+                  field = FieldFactory::reInit(field, varList[varID]);
                   cdo_read_record(streamID1, field);
 
                   fieldc_mul(field, dpm);
 
-                  if (field.nmiss || !rsamp1.empty())
+                  if (field.getNumMiss() || !rsamp1.empty())
                     {
-                      if (rsamp1.empty()) rsamp1.resize(rvars1.size, dsets);
+                      if (rsamp1.empty()) rsamp1.resize(rvars1.getSize(), dsets);
                       field2_vincr(rsamp1, field, dpm);
                     }
 

src/module_list.h

@@ -239,8 +239,8 @@ static const module_t module_Vargen         = {"Vargen"         ,Vargen
 // static const module_t module_Writegrid      = {"Writegrid"      ,Writegrid      , {}                , WritegridOperators      , EXPOSED  , CDI_REAL , 1  , 1     , NoRestriction };
 // static const module_t module_Writerandom    = {"Writerandom"    ,Writerandom    , {}                , WriterandomOperators    , EXPOSED  , CDI_REAL , 1  , 1     , NoRestriction };
 // static const module_t module_Yeararith      = {"Yeararith"      ,Yeararith      , YeararithHelp     , YeararithOperators      , EXPOSED  , CDI_REAL , 2  , 1     , NoRestriction };
-// static const module_t module_Yearmonstat    = {"Yearmonstat"    ,Yearmonstat    , YearmonstatHelp   , YearmonstatOperators    , EXPOSED  , CDI_REAL , 1  , 1     , NoRestriction };
-// static const module_t module_Ydayarith      = {"Ydayarith"      ,Ydayarith      , YdayarithHelp     , YdayarithOperators      , EXPOSED  , CDI_REAL , 2  , 1     , NoRestriction };
+static const module_t module_Yearmonstat    = {"Yearmonstat"    ,Yearmonstat    , YearmonstatHelp   , YearmonstatOperators    , EXPOSED  , CDI_REAL , 1  , 1     , NoRestriction };
+static const module_t module_Ydayarith      = {"Ydayarith"      ,Ydayarith      , YdayarithHelp     , YdayarithOperators      , EXPOSED  , CDI_REAL , 2  , 1     , NoRestriction };
 // static const module_t module_Ydaypctl       = {"Ydaypctl"       ,Ydaypctl       , YdaypctlHelp      , YdaypctlOperators       , EXPOSED  , CDI_REAL , 3  , 1     , NoRestriction };
 // static const module_t module_Ydaystat       = {"Ydaystat"       ,Ydaystat       , YdaystatHelp      , YdaystatOperators       , EXPOSED  , CDI_REAL , 1  , 1     , NoRestriction };
 // static const module_t module_Ydrunpctl      = {"Ydrunpctl"      ,Ydrunpctl      , YdrunpctlHelp     , YdrunpctlOperators      , EXPOSED  , CDI_REAL , 3  , 1     , NoRestriction };