diff --git a/Applications/DataExplorer/mainwindow.cpp b/Applications/DataExplorer/mainwindow.cpp index 1ddfbc3d7040a51e7cd5746cbf0bd9ac3e672df0..ad8eb982a1237872f54d93db3f15cea11bcec022 100644 --- a/Applications/DataExplorer/mainwindow.cpp +++ b/Applications/DataExplorer/mainwindow.cpp @@ -840,31 +840,31 @@ QMenu* MainWindow::createImportFilesMenu() { QMenu* importFiles = new QMenu("&Import Files", this); importFiles->addAction("&FEFLOW Files...", - [=] { open(ImportFileType::FEFLOW); }); + [this] { open(ImportFileType::FEFLOW); }); importFiles->addAction("G&MS Files...", - [=] { open(ImportFileType::GMS); }); + [this] { open(ImportFileType::GMS); }); importFiles->addAction("&GMSH Files...", - [=] { open(ImportFileType::GMSH); }); + [this] { open(ImportFileType::GMSH); }); importFiles->addAction("&Gocad TSurface...", - [=] { open(ImportFileType::GOCAD_TSURF); }); + [this] { open(ImportFileType::GOCAD_TSURF); }); #ifdef OGS_USE_NETCDF importFiles->addAction("&NetCDF Files...", - [=] { open(ImportFileType::NETCDF); }); + [this] { open(ImportFileType::NETCDF); }); #endif // OGS_USE_NETCDF importFiles->addAction("&Petrel Files...", - [=] { loadPetrelFiles(); }); + [this] { loadPetrelFiles(); }); importFiles->addAction("&Raster Files...", - [=] { open(ImportFileType::RASTER); }); + [this] { open(ImportFileType::RASTER); }); #if defined VTKFBXCONVERTER_FOUND importFiles->addAction("R&aster Files as PolyData...", - [=] { open(ImportFileType::POLYRASTER); }); + [this] { open(ImportFileType::POLYRASTER); }); #endif importFiles->addAction("&Shape Files...", - [=] { open(ImportFileType::SHAPE); }); + [this] { open(ImportFileType::SHAPE); }); importFiles->addAction("&TetGen Files...", - [=] { open(ImportFileType::TETGEN); }); + [this] { open(ImportFileType::TETGEN); }); importFiles->addAction("&VTK Files...", - [=] { open(ImportFileType::VTK); }); + [this] { open(ImportFileType::VTK); }); return importFiles; } diff --git a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp index 4eb9a83e7762db2d7d2c884587dadf708e760e3f..c36e82caf72f83bce6742da73bbe333523169f9d 100644 --- a/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp +++ b/MaterialLib/MPL/Properties/CapillaryPressureSaturation/SaturationVanGenuchten.cpp @@ -91,7 +91,7 @@ PropertyDataType SaturationVanGenuchten::dValue( return 0.; } - double const dS_eff_dp_cap = -m_ * std::pow(p_cap / p_b_, n - 1) * + double const dS_eff_dp_cap = -m_ * std::pow(p, n - 1) * std::pow(1 + p_to_n, -1. - m_) / (p_b_ * (1. - m_)); return dS_eff_dp_cap * (S_L_max_ - S_L_res_); diff --git a/MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCorey.cpp b/MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCorey.cpp index 4865dd8fdbc0144c43bf5c421f60775d7515256c..49b3a9f4824e439ed4daba9d7ee74484f3912cf0 100644 --- a/MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCorey.cpp +++ b/MaterialLib/MPL/Properties/RelativePermeability/RelPermBrooksCorey.cpp @@ -41,7 +41,7 @@ PropertyDataType RelPermBrooksCorey::value( { /// here, an extra computation of saturation is forced, guaranteeing a /// correct value. In order to speed up the computing time, saturation could - /// be insertred into the primary variable array after it is computed in the + /// be inserted into the primary variable array after it is computed in the /// FEM assembly. auto const s_L = std::visit( [&variable_array, &pos, t, dt](auto&& scale) -> double { @@ -83,7 +83,7 @@ PropertyDataType RelPermBrooksCorey::dValue( " derivatives with respect to liquid saturation only."); /// here, an extra computation of saturation is forced, guaranteeing a /// correct value. In order to speed up the computing time, saturation could - /// be insertred into the primary variable array after it is computed in the + /// be inserted into the primary variable array after it is computed in the /// FEM assembly. auto const s_L = std::visit( [&variable_array, &pos, t, dt](auto&& scale) -> double { diff --git a/MaterialLib/MPL/Properties/RelativePermeability/RelPermLiakopoulos.cpp b/MaterialLib/MPL/Properties/RelativePermeability/RelPermLiakopoulos.cpp index 7fab447cf45e41d1925a9929ae48a727768feadc..efb0545f7d1d04d74372a184fa2e97093a02b419 100644 --- a/MaterialLib/MPL/Properties/RelativePermeability/RelPermLiakopoulos.cpp +++ b/MaterialLib/MPL/Properties/RelativePermeability/RelPermLiakopoulos.cpp @@ -32,7 +32,7 @@ PropertyDataType RelPermLiakopoulos::value( { /// here, an extra computation of saturation is forced, guaranteeing a /// correct value. In order to speed up the computing time, saturation could - /// be insertred into the primary variable array after it is computed in the + /// be inserted into the primary variable array after it is computed in the /// FEM assembly. auto const s_L = std::visit( [&variable_array, &pos, t, dt](auto&& scale) -> double { @@ -71,7 +71,7 @@ PropertyDataType RelPermLiakopoulos::dValue( " derivatives with respect to liquid saturation only."); /// here, an extra computation of saturation is forced, guaranteeing a /// correct value. In order to speed up the computing time, saturation could - /// be insertred into the primary variable array after it is computed in the + /// be inserted into the primary variable array after it is computed in the /// FEM assembly. auto const s_L = std::visit( [&variable_array, &pos, t, dt](auto&& scale) -> double {