Upscaling Examples: Spring cleaning

Mostly:
  - Sort headers
  - Re-indent to fix white-space
  - Remove long-disabled code

examples/exp_variogram.cpp

@@ -27,28 +27,11 @@
   difference in their properties (poro or perm)
 
   Direction for pairing is set from the command line
-
 */
+
 #include <config.h>
 
-#include <opm/output/eclipse/CornerpointChopper.hpp>
-#include <opm/upscaling/SinglePhaseUpscaler.hpp>
-#include <opm/porsol/common/setupBoundaryConditions.hpp>
-#include <opm/core/utility/Units.hpp>
-
-#include <boost/random/mersenne_twister.hpp>
-#include <boost/random/uniform_int.hpp>
-#include <boost/random/uniform_real.hpp>
-#include <boost/random/variate_generator.hpp>
-
-#include <ios>
-#include <iomanip>
-#include <sys/utsname.h>
-#include <ctime>
-#include <cmath>
-#include <sstream>
-#include <fstream>
-#include <iostream>
+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 
 #include <dune/common/version.hh>
 #if DUNE_VERSION_NEWER(DUNE_COMMON, 2, 3)
@@ -57,6 +40,31 @@
 #include <dune/common/mpihelper.hh>
 #endif
 
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>
+
+#include <opm/core/utility/Units.hpp>
+
+#include <opm/output/eclipse/CornerpointChopper.hpp>
+
+#include <opm/porsol/common/setupBoundaryConditions.hpp>
+
+#include <opm/upscaling/SinglePhaseUpscaler.hpp>
+
+#include <cmath>
+#include <ctime>
+#include <fstream>
+#include <iomanip>
+#include <ios>
+#include <iostream>
+#include <sstream>
+
+#include <sys/utsname.h>
+
+#include <boost/random/mersenne_twister.hpp>
+#include <boost/random/uniform_int.hpp>
+#include <boost/random/uniform_real.hpp>
+#include <boost/random/variate_generator.hpp>
+
 int main(int argc, char** argv)
 try
 {