Added clang-format switches.

src/Runstat.cc

@@ -70,19 +70,19 @@ void *Runstat(void *argument)
   cdoOperatorAdd("runvar1",  func_var1,  0, NULL);
   cdoOperatorAdd("runstd",   func_std,   0, NULL);
   cdoOperatorAdd("runstd1",  func_std1,  0, NULL);
-  // clang-format on
 
   int operatorID = cdoOperatorID();
   int operfunc = cdoOperatorF1(operatorID);
 
-  operatorInputArg("number of timesteps");
-  int ndates = parameter2int(operatorArgv()[0]);
-
   bool lrange  = operfunc == func_range;
   bool lmean   = operfunc == func_mean || operfunc == func_avg;
   bool lstd    = operfunc == func_std || operfunc == func_std1;
   bool lvarstd = operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1;
   int  divisor = operfunc == func_std1 || operfunc == func_var1;
+  // clang-format on
+
+  operatorInputArg("number of timesteps");
+  int ndates = parameter2int(operatorArgv()[0]);
 
   int streamID1 = pstreamOpenRead(cdoStreamName(0));
 

src/Seasstat.cc

@@ -58,6 +58,7 @@ void *Seasstat(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   cdoOperatorAdd("seasrange", func_range, 0, NULL);
   cdoOperatorAdd("seasmin",   func_min,   0, NULL);
   cdoOperatorAdd("seasmax",   func_max,   0, NULL);
@@ -72,14 +73,15 @@ void *Seasstat(void *argument)
   int operatorID = cdoOperatorID();
   int operfunc = cdoOperatorF1(operatorID);
 
-  int season_start = get_season_start();
-  get_season_name(seas_name);
-
   bool lrange  = operfunc == func_range;
   bool lmean   = operfunc == func_mean || operfunc == func_avg;
   bool lstd    = operfunc == func_std || operfunc == func_std1;
   bool lvarstd = operfunc == func_std || operfunc == func_var || operfunc == func_std1 || operfunc == func_var1;
   int  divisor = operfunc == func_std1 || operfunc == func_var1;
+  // clang-format on
+
+  int season_start = get_season_start();
+  get_season_name(seas_name);
 
   int streamID1 = pstreamOpenRead(cdoStreamName(0));
 

src/Selbox.cc

@@ -857,8 +857,10 @@ void *Selbox(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SELLONLATBOX = cdoOperatorAdd("sellonlatbox", 0, 0, "western and eastern longitude and southern and northern latitude");
   int SELINDEXBOX  = cdoOperatorAdd("selindexbox",  0, 0, "index of first and last longitude and index of first and last latitude");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Selmulti.cc

@@ -174,9 +174,11 @@ void *Selmulti(void *argument)
 
   cdoInitialize(argument);
 
-  int SELMULTI       = cdoOperatorAdd("selmulti",       0, 0, "filename/string with selection specification ");
-  int DELMULTI       = cdoOperatorAdd("delmulti",       0, 0, "filename/string with selection specification ");
-  int CHANGEMULTI    = cdoOperatorAdd("changemulti",    0, 0, "filename/string with selection specification ");
+  // clang-format off
+  int SELMULTI    = cdoOperatorAdd("selmulti",    0, 0, "filename/string with selection specification ");
+  int DELMULTI    = cdoOperatorAdd("delmulti",    0, 0, "filename/string with selection specification ");
+  int CHANGEMULTI = cdoOperatorAdd("changemulti", 0, 0, "filename/string with selection specification ");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Seltime.cc

@@ -194,6 +194,7 @@ void *Seltime(void *argument)
 
   bool lcopy = UNCHANGED_RECORD;
 
+  // clang-format off
   int SELTIMESTEP = cdoOperatorAdd("seltimestep", func_step,     0, "timesteps");
   int SELDATE     = cdoOperatorAdd("seldate",     func_datetime, 0, "start date and end date (format YYYY-MM-DDThh:mm:ss)");
   int SELTIME     = cdoOperatorAdd("seltime",     func_time,     0, "times (format hh:mm:ss)");
@@ -203,6 +204,7 @@ void *Seltime(void *argument)
   int SELYEAR     = cdoOperatorAdd("selyear",     func_date,     0, "years");
   int SELSEASON   = cdoOperatorAdd("selseason",   func_date,     0, "seasons");
   int SELSMON     = cdoOperatorAdd("selsmon",     func_date,     0, "month[,nts1[,nts2]]");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Selvar.cc

@@ -67,6 +67,7 @@ void *Selvar(void *argument)
 # define TAKES_INTEGERS(id) (cdoOperatorF2(id) & 4)
 # define TAKES_FLOATS(id) (cdoOperatorF2(id) & 8)
 
+  // clang-format off
   int SELPARAM     = cdoOperatorAdd("selparam",     0, 2,   "parameters");
   int SELCODE      = cdoOperatorAdd("selcode",      0, 4,   "code numbers");
   int SELNAME      = cdoOperatorAdd("selname",      0, 2,   "variable names");
@@ -81,6 +82,7 @@ void *Selvar(void *argument)
   int DELCODE      = cdoOperatorAdd("delcode",      1, 1,   "code numbers");
   int DELNAME      = cdoOperatorAdd("delname",      1, 2|1, "variable names");
   int SELLTYPE     = cdoOperatorAdd("selltype",     0, 4,   "GRIB level types"); 
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Set.cc

@@ -58,6 +58,7 @@ void *Set(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETCODE    = cdoOperatorAdd("setcode",    0, 0, "code number");
   int SETPARAM   = cdoOperatorAdd("setparam",   0, 0, "parameter identifier (format: code[.tabnum] or num[.cat[.dis]])");
   int SETNAME    = cdoOperatorAdd("setname",    0, 0, "variable name");
@@ -65,6 +66,7 @@ void *Set(void *argument)
   int SETLEVEL   = cdoOperatorAdd("setlevel",   0, 0, "level");
   int SETLTYPE   = cdoOperatorAdd("setltype",   0, 0, "GRIB level type");
   int SETTABNUM  = cdoOperatorAdd("settabnum",  0, 0, "GRIB table number");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Setgrid.cc

@@ -54,6 +54,7 @@ void *Setgrid(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETGRID       = cdoOperatorAdd("setgrid",       0, 0, "grid description file or name");
   int SETGRIDTYPE   = cdoOperatorAdd("setgridtype",   0, 0, "grid type");
   int SETGRIDAREA   = cdoOperatorAdd("setgridarea",   0, 0, "filename with area weights");
@@ -62,6 +63,7 @@ void *Setgrid(void *argument)
   int SETGRIDNUMBER = cdoOperatorAdd("setgridnumber", 0, 0, "grid number and optionally grid position");
   int SETGRIDURI    = cdoOperatorAdd("setgriduri",    0, 0, "reference URI of the horizontal grid");
   int USEGRIDNUMBER = cdoOperatorAdd("usegridnumber", 0, 0, "use existing grid identified by grid number");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Sethalo.cc

@@ -451,8 +451,10 @@ void *Sethalo(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETHALO = cdoOperatorAdd("sethalo", 0, 0, NULL);
                 cdoOperatorAdd("tpnhalo", 0, 0, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Setmiss.cc

@@ -51,11 +51,13 @@ void *Setmiss(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETMISSVAL = cdoOperatorAdd("setmissval", 0, 0, "missing value");
   int SETCTOMISS = cdoOperatorAdd("setctomiss", 0, 0, "constant");
   int SETMISSTOC = cdoOperatorAdd("setmisstoc", 0, 0, "constant");
   int SETRTOMISS = cdoOperatorAdd("setrtomiss", 0, 0, "range (min, max)");
   int SETVRANGE  = cdoOperatorAdd("setvrange",  0, 0, "range (min, max)");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Settime.cc

@@ -176,6 +176,7 @@ void *Settime(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETYEAR     = cdoOperatorAdd("setyear",      0,  1, "year");
   int SETMON      = cdoOperatorAdd("setmon",       0,  1, "month");
   int SETDAY      = cdoOperatorAdd("setday",       0,  1, "day");
@@ -187,6 +188,7 @@ void *Settime(void *argument)
   int SETREFTIME  = cdoOperatorAdd("setreftime",   0, -2, "date,time<,units> (format YYYY-MM-DD,hh:mm:ss)");
   int SETCALENDAR = cdoOperatorAdd("setcalendar",  0,  1, "calendar (standard, proleptic_gregorian, 360_day, 365_day, 366_day)");
   int SHIFTTIME   = cdoOperatorAdd("shifttime",    0,  1, "shift value");
+  // clang-format on
 
   int operatorID = cdoOperatorID();
   // nargs = cdoOperatorF2(operatorID);

src/Setzaxis.cc

@@ -64,8 +64,10 @@ void *Setzaxis(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SETZAXIS       = cdoOperatorAdd("setzaxis",        0, 0, "zaxis description file");
   int GENLEVELBOUNDS = cdoOperatorAdd("genlevelbounds",  0, 0, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Showinfo.cc

@@ -47,6 +47,7 @@ void *Showinfo(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SHOWYEAR      = cdoOperatorAdd("showyear",      0, 0, NULL);
   int SHOWMON       = cdoOperatorAdd("showmon",       0, 0, NULL);
   int SHOWDATE      = cdoOperatorAdd("showdate",      0, 0, NULL);
@@ -61,6 +62,7 @@ void *Showinfo(void *argument)
   int SHOWLTYPE     = cdoOperatorAdd("showltype",     0, 0, NULL);
   int SHOWFORMAT    = cdoOperatorAdd("showformat",    0, 0, NULL);
   int SHOWGRID      = cdoOperatorAdd("showgrid",      0, 0, NULL); 
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Sinfo.cc

@@ -86,6 +86,7 @@ void *Sinfo(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   cdoOperatorAdd("sinfo",   func_generic, 0, NULL);
   cdoOperatorAdd("sinfop",  func_param,   0, NULL);
   cdoOperatorAdd("sinfon",  func_name,    0, NULL);
@@ -94,6 +95,7 @@ void *Sinfo(void *argument)
   cdoOperatorAdd("seinfop", func_param,   1, NULL);
   cdoOperatorAdd("seinfon", func_name,    1, NULL);
   cdoOperatorAdd("seinfoc", func_code,    1, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Smooth.cc

@@ -403,9 +403,11 @@ void *Smooth(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SMOOTH  = cdoOperatorAdd("smooth",   0,   0, NULL);
   int SMOOTH9 = cdoOperatorAdd("smooth9",  0,   0, NULL);
- 
+  // clang-format on
+  
   int operatorID = cdoOperatorID();
 
   if ( operatorID == SMOOTH ) smooth_set_parameter(&xnsmooth, &spoint);

src/Sort.cc

@@ -157,10 +157,12 @@ void *Sort(void *argument)
 
   cdoInitialize(argument);
 
+  // clang-format off
   int SORTCODE  = cdoOperatorAdd("sortcode",  0, 0, NULL);
   int SORTPARAM = cdoOperatorAdd("sortparam", 0, 0, NULL);
   int SORTNAME  = cdoOperatorAdd("sortname",  0, 0, NULL);
   int SORTLEVEL = cdoOperatorAdd("sortlevel", 0, 0, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Spectral.cc

@@ -57,12 +57,14 @@ void *Spectral(void *argument)
 
   bool lcopy = UNCHANGED_RECORD;
 
+  // clang-format off
   int GP2SP  = cdoOperatorAdd("gp2sp",  0, 0, NULL);
   int GP2SPL = cdoOperatorAdd("gp2spl", 0, 0, NULL);
   int SP2GP  = cdoOperatorAdd("sp2gp",  0, 0, NULL);
   int SP2GPL = cdoOperatorAdd("sp2gpl", 0, 0, NULL);
   int SP2SP  = cdoOperatorAdd("sp2sp",  0, 0, NULL);
   int SPCUT  = cdoOperatorAdd("spcut",  0, 0, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Split.cc

@@ -66,6 +66,7 @@ void *Split(void *argument)
 
   bool lcopy = UNCHANGED_RECORD;
 
+  // clang-format off
   int SPLITCODE   = cdoOperatorAdd("splitcode",   0, 0, NULL);
   int SPLITPARAM  = cdoOperatorAdd("splitparam",  0, 0, NULL);
   int SPLITNAME   = cdoOperatorAdd("splitname",   0, 0, NULL);
@@ -73,6 +74,7 @@ void *Split(void *argument)
   int SPLITGRID   = cdoOperatorAdd("splitgrid",   0, 0, NULL);
   int SPLITZAXIS  = cdoOperatorAdd("splitzaxis",  0, 0, NULL);
   int SPLITTABNUM = cdoOperatorAdd("splittabnum", 0, 0, NULL);
+  // clang-format on
 
   int operatorID = cdoOperatorID();
 

src/Splittime.cc

@@ -77,10 +77,12 @@ void *Splittime(void *argument)
 
   bool lcopy = UNCHANGED_RECORD;
 
+  // clang-format off
   int SPLITHOUR = cdoOperatorAdd("splithour", func_time, 10000, NULL);
   int SPLITDAY  = cdoOperatorAdd("splitday",  func_date,     1, NULL);
   int SPLITMON  = cdoOperatorAdd("splitmon",  func_date,   100, NULL);
   int SPLITSEAS = cdoOperatorAdd("splitseas", func_date,   100, NULL);
+  // clang-format on
 
   UNUSED(SPLITDAY);
   UNUSED(SPLITHOUR);

src/Splityear.cc

@@ -58,8 +58,10 @@ void *Splityear(void *argument)
   
   bool lcopy = UNCHANGED_RECORD;
 
+  // clang-format off
   int SPLITYEAR    = cdoOperatorAdd("splityear",     0, 10000, NULL);
   int SPLITYEARMON = cdoOperatorAdd("splityearmon",  0,   100, NULL);
+  // clang-format on
   
   int operatorID = cdoOperatorID();
   int operintval = cdoOperatorF2(operatorID);