Commit b1509460 authored by Dion Haefner's avatar Dion Haefner

hunt warnings

parent a6e171e8
......@@ -16,11 +16,6 @@
#ifndef DUNE_GEOINVERSION_HDF5_TOOLS_HH
#define DUNE_GEOINVERSION_HDF5_TOOLS_HH
#include <dune/pdelab/common/geometrywrapper.hh>
#include <assert.h>
#include <sstream>
namespace Dune {
namespace Dorie {
class H5Tools{
......
......@@ -13,11 +13,6 @@
#ifndef DUNE_GEOINVERSION_HDF5_TOOLS_HH
#define DUNE_GEOINVERSION_HDF5_TOOLS_HH
#include <dune/pdelab/common/geometrywrapper.hh>
#include <assert.h>
#include <sstream>
namespace Dune {
namespace Dorie {
class H5Tools{
......
......@@ -17,13 +17,20 @@
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#include <assert.h>
#include <sstream>
// DUNE includes
// Do not treat DUNE warnings as errors
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wall"
#include <dune/common/parallel/mpihelper.hh>
#include <dune/common/parametertreeparser.hh>
#include <dune/common/fvector.hh>
#include <dune/geometry/type.hh>
#include <dune/grid/common/gridenums.hh>
#include <dune/pdelab/common/geometrywrapper.hh>
#pragma GCC diagnostic pop
// dorie-rfg includes
#include <dune/dorie-rfg/datatypes.hh>
......
......@@ -105,7 +105,7 @@ int main(int argc, char** argv)
const bool adaptivity = inifile.get<bool>("adaptivity.useAdaptivity");
// Attempt to create output directory
int status = mkdir(outputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
mkdir(outputPath.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
int result = access(outputPath.c_str(), W_OK);
if (result != 0)
DUNE_THROW(Dune::IOError,"Output folder " << outputPath << " not writable");
......
......@@ -2,6 +2,7 @@
#define DORIE_HH
#include <iostream>
#include <iomanip>
#include <vector>
#include <map>
#include <string>
......@@ -15,6 +16,9 @@
#include <unistd.h>
#include <hdf5.h>
// Do not treat DUNE warnings as errors
#pragma GCC diagnostic push
#pragma GCC diagnostic warning "-Wall"
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
#include <dune/common/ios_state.hh>
......@@ -44,8 +48,10 @@
#include <dune/pdelab/gridoperator/gridoperator.hh>
#include <dune/pdelab/gridoperator/onestep.hh>
#include <dune/pdelab/instationary/onestep.hh>
#include <dune/pdelab/instationary/onestepparameter.hh>
#include <dune/pdelab/newton/newton.hh>
#include <dune/pdelab/stationary/linearproblem.hh>
#pragma GCC diagnostic pop
#include <dune/dorie/solver.hh>
#include <dune/dorie/interface.hh>
......
......@@ -4,12 +4,6 @@
#ifndef DUNE_DORIE_INSTATIONARY_IMPLICITONESTEP_HH
#define DUNE_DORIE_INSTATIONARY_IMPLICITONESTEP_HH
#include <iostream>
#include <iomanip>
#include <dune/common/ios_state.hh>
#include <dune/pdelab/instationary/onestepparameter.hh>
namespace Dune {
namespace Dorie {
using namespace Dune::PDELab;
......
......@@ -130,10 +130,9 @@ public:
Dune::PDELab::NumericalJacobianSkeleton<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
Dune::PDELab::NumericalJacobianBoundary<RichardsDGSpatialOperator<Traits,Parameter,Boundary,SourceTerm,FEM,adjoint> >(1.e-7),
param(param_), boundary(boundary_), sourceTerm(sourceTerm_), method(method_), weights(weights_),
penalty_factor(config.get<RF>("dg.penaltyFactor")),
penalty_factor(config.get<RF>("dg.penaltyFactor")), mapper(view_),
intorderadd(intorderadd_), quadrature_factor(quadrature_factor_),
cache(20),
mapper(view_)
cache(20)
{
theta = 1.;
if (method == RichardsDGMethod::SIPG) theta = -1.;
......
......@@ -201,7 +201,7 @@ namespace Dune {
template<typename OUT>
struct H5File::AttributeReader {
static OUT read(const hid_t attr_id, const hid_t atype_mem, const hid_t rank, const std::vector<hsize_t> dims)
static OUT read(const hid_t attr_id, const hid_t atype_mem, const hsize_t rank, const std::vector<hsize_t> dims)
{
std::vector<hsize_t>::size_type flat_size = 1;
for(std::vector<hsize_t>::size_type i=0; i<rank; i++)
......@@ -218,7 +218,7 @@ namespace Dune {
template<>
struct H5File::AttributeReader<std::string> {
static std::string read(const hid_t attr_id, const hid_t atype_mem, const hid_t rank, const std::vector<hsize_t> dims)
static std::string read(const hid_t attr_id, const hid_t atype_mem, const hsize_t rank, const std::vector<hsize_t> dims)
{
if(rank > 1)
DUNE_THROW(Exception,"Cannot convert attribute with rank " << rank << " to string");
......@@ -233,7 +233,7 @@ namespace Dune {
template<typename A>
struct H5File::AttributeReader<std::vector<A>> {
static std::vector<A> read(const hid_t attr_id, const hid_t atype_mem, const hid_t rank, const std::vector<hsize_t> dims)
static std::vector<A> read(const hid_t attr_id, const hid_t atype_mem, const hsize_t rank, const std::vector<hsize_t> dims)
{
std::vector<hsize_t>::size_type flat_size = 1;
for(std::vector<hsize_t>::size_type i=0; i<rank; i++)
......@@ -250,7 +250,7 @@ namespace Dune {
template<typename A, int B>
struct H5File::AttributeReader<Dune::FieldVector<A,B>> {
static Dune::FieldVector<A,B> read(const hid_t attr_id, const hid_t atype_mem, const hid_t rank, const std::vector<hsize_t> dims)
static Dune::FieldVector<A,B> read(const hid_t attr_id, const hid_t atype_mem, const hsize_t rank, const std::vector<hsize_t> dims)
{
std::vector<hsize_t>::size_type flat_size = 1;
for(std::vector<hsize_t>::size_type i=0; i<rank; i++)
......@@ -267,7 +267,7 @@ namespace Dune {
template<typename A, int B>
struct H5File::AttributeReader<std::array<A,B>> {
static std::array<A,B> read(const hid_t attr_id, const hid_t atype_mem, const hid_t rank, const std::vector<hsize_t> dims)
static std::array<A,B> read(const hid_t attr_id, const hid_t atype_mem, const hsize_t rank, const std::vector<hsize_t> dims)
{
std::vector<hsize_t>::size_type flat_size = 1;
for(std::vector<hsize_t>::size_type i=0; i<rank; i++)
......
......@@ -28,7 +28,7 @@ def test_dorie(iniinfo,inifile,executable):
elif iniinfo["_test_target"] != "None":
command.append(iniinfo["_test_target"])
if "_test_command_options" in iniinfo and iniinfo["_test_command_options"] != "None":
command.append(iniinfo["_test_command_options"])
command.append(iniinfo["_test_command_options"].split())
print("Calling dorie with: " + " ".join(command))
# Run DORiE and measure total execution time
......
......@@ -2,7 +2,7 @@ include ${CMAKE_BINARY_DIR}/doc/default_files/parfield.ini
__name = pfg_parallel
_test_command = pfg
_test_command_options = --parallel -m=--allow-run-as-root
_test_command_options = --parallel 2 -m=--allow-run-as-root
_asset_path = "${CMAKE_CURRENT_LIST_DIR}"
_data_path = {_asset_path}/parfield-data
_evaluation = reference
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment