cleanup

src/Remapgrid.cc

@@ -621,12 +621,12 @@ Remapgrid(void *argument)
       tsID++;
     }
 
-  cdo_stream_close(streamID2);
-  cdo_stream_close(streamID1);
-
   if (doRemap && remap_genweights && remaps[0].nused == 0)
     remap_print_warning(remapWeightsFile, operfunc, remaps[0].srcGrid, remaps[0].nmiss);
 
+  cdo_stream_close(streamID2);
+  cdo_stream_close(streamID1);
+
   for (remapIndex = 0; remapIndex < numRemaps; remapIndex++)
     {
       auto &remap = remaps[remapIndex];

src/Remapweights.cc

@@ -69,7 +69,6 @@ Remapweights(void *argument)
 
   if (Options::cdoVerbose) cdo_print("Extrapolation %s!", remapExtrapolate ? "enabled" : "disabled");
 
-  // -> function ???
   {
     operator_input_arg("grid description file or name");
     if (operfunc == REMAPDIS && cdo_operator_argc() == 2)

src/remap_utils.cc

@@ -449,8 +449,8 @@ remap_set_grids(int vlistID, const VarList &varList)
           if (gridtype == GRID_GENERIC && gridInqSize(gridID) <= 2) { remapGrids[index] = false; }
           else
             {
-              auto nvars = vlistNvars(vlistID);
-              for (int varID = 0; varID < nvars; ++varID)
+              auto numVars = vlistNvars(vlistID);
+              for (int varID = 0; varID < numVars; ++varID)
                 if (gridID == varList[varID].gridID)
                   {
                     cdo_abort("Unsupported %s coordinates (Variable: %s)!", gridNamePtr(gridtype), varList[varID].name);