Cleanup

src/Wind.cc

@@ -83,6 +83,7 @@ public:
     .constraints = { 1, 1, NoRestriction },
   };
   inline static RegisterEntry<Wind> registration = RegisterEntry<Wind>(module);
+
   int UV2DV, UV2DVL, DV2UV, DV2UVL, DV2PS;
   CdoStreamID streamID1;
   CdoStreamID streamID2;
@@ -114,16 +115,13 @@ public:
   void
   init()
   {
-
     dataIsUnchanged = data_is_unchanged();
 
-    // clang-format off
     UV2DV = module.get_id("uv2dv");
     UV2DVL = module.get_id("uv2dvl");
     DV2UV = module.get_id("dv2uv");
     DV2UVL = module.get_id("dv2uvl");
     DV2PS = module.get_id("dv2ps");
-    // clang-format on
 
     operatorID = cdo_operator_id();
 
@@ -213,9 +211,9 @@ public:
             if (gridID1 != vlistInqVarGrid(vlistID1, varID2)) cdo_abort("U and V wind must have the same grid represention!");
 
             auto numLPE = gridInqNP(gridID1);
-            const long nlon = gridInqXsize(gridID1);
-            const long nlat = gridInqYsize(gridID1);
-            const long ntr1 = nlat2ntr(nlat);
+            long nlon = gridInqXsize(gridID1);
+            long nlat = gridInqYsize(gridID1);
+            long ntr1 = nlat2ntr(nlat);
 
             if (numLPE > 0 && nlat != (numLPE * 2)) cdo_abort("U and V fields on Gaussian grid are not global!");
 
@@ -257,8 +255,8 @@ public:
 
             if (gridIDgp != -1)
               {
-                const long nlat = gridInqYsize(gridIDgp);
-                const long ntr1 = nlat2ntr(nlat);
+                long nlat = gridInqYsize(gridIDgp);
+                long ntr1 = nlat2ntr(nlat);
                 if (gridInqTrunc(gridIDsp) != ntr1) gridIDgp = -1;
               }
 
@@ -273,8 +271,8 @@ public:
 
             defineAttributesUV(vlistID2, gridID2, varID1, varID2);
 
-            const long nlon = gridInqXsize(gridID2);
-            const long nlat = gridInqYsize(gridID2);
+            long nlon = gridInqXsize(gridID2);
+            long nlat = gridInqYsize(gridID2);
             ntr = gridInqTrunc(gridID1);
             nlev = zaxisInqSize(vlistInqVarZaxis(vlistID1, varID1));
 
@@ -322,6 +320,7 @@ public:
         ovar2.resize(nlev * gridsize);
       }
   }
+
   void
   run()
   {