OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double

Browse Source
This commit is contained in:
Magne Sjaastad 2018-02-16 08:26:36 +01:00
parent ac96824640
commit 7f5ff7be0f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.cpp
View File

@ -52,11 +52,11 @@ RimEllipseFractureTemplate::RimEllipseFractureTemplate(void)
{ {
CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", ""); CAF_PDM_InitObject("Fracture Template", ":/FractureTemplate16x16.png", "", "");
CAF_PDM_InitField(&m_halfLength, "HalfLength", 0.0f, "Halflength X<sub>f</sub>", "", "", ""); CAF_PDM_InitField(&m_halfLength, "HalfLength", 0.0, "Halflength X<sub>f</sub>", "", "", "");
CAF_PDM_InitField(&m_height, "Height", 0.0f, "Height", "", "", ""); CAF_PDM_InitField(&m_height, "Height", 0.0, "Height", "", "", "");
CAF_PDM_InitField(&m_width, "Width", 0.0f, "Width", "", "", ""); CAF_PDM_InitField(&m_width, "Width", 0.0, "Width", "", "", "");
CAF_PDM_InitField(&m_userDefinedEffectivePermeability,"Permeability", 0.0f, "Permeability [mD]", "", "", ""); CAF_PDM_InitField(&m_userDefinedEffectivePermeability,"Permeability", 0.0, "Permeability [mD]", "", "", "");
m_fractureGrid = new RigFractureGrid(); m_fractureGrid = new RigFractureGrid();
setupFractureGridCells(); setupFractureGridCells();
@ -297,17 +297,17 @@ void RimEllipseFractureTemplate::setDefaultValuesFromUnit()
{ {
if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD) if (fractureTemplateUnit() == RiaEclipseUnitTools::UNITS_FIELD)
{ {
m_width = 0.5f; m_width = 0.5;
m_userDefinedEffectivePermeability = 80000.0f; m_userDefinedEffectivePermeability = 80000.0;
m_halfLength = 300.0f; m_halfLength = 300.0;
m_height = 225.0f; m_height = 225.0;
} }
else else
{ {
m_width = 0.01f; m_width = 0.01;
m_userDefinedEffectivePermeability = 100000.0f; m_userDefinedEffectivePermeability = 100000.0;
m_halfLength = 100.0f; m_halfLength = 100.0;
m_height = 75.0f; m_height = 75.0;
} }
this->setDefaultWellDiameterFromUnit(); this->setDefaultWellDiameterFromUnit();

8
ApplicationCode/ProjectDataModel/Completions/RimEllipseFractureTemplate.h
View File

@ -79,8 +79,8 @@ private:
private: private:
cvf::ref<RigFractureGrid> m_fractureGrid; cvf::ref<RigFractureGrid> m_fractureGrid;
caf::PdmField<float> m_halfLength; caf::PdmField<double> m_halfLength;
caf::PdmField<float> m_height; caf::PdmField<double> m_height;
caf::PdmField<float> m_width; caf::PdmField<double> m_width;
caf::PdmField<float> m_userDefinedEffectivePermeability; caf::PdmField<double> m_userDefinedEffectivePermeability;
}; };