#3515 LGR Export/Temp LGR. New split type: One LGR per Completion

This commit is contained in:
Bjørn Erik Jensen committed 2018-10-23 11:13:55 +02:00
1 parent cdda4d74df
commit ffa1a85187
15 files changed
+358 -127

No files matched your search

@@ -41,18 +41,6 @@
CAF_PDM_SOURCE_INIT(RicfExportLgrForCompletions, "exportLgrForCompletions");
namespace caf
{
template<>
void RicfExportLgrForCompletions::LgrSplitType::setUp()
{
addItem(ExportLgr::ONE_LGR_PER_GRID_CELL, "ONE_LGR_PER_GRID_CELL", "One LGR per Main Grid Cell");
addItem(ExportLgr::SINGLE_LGR_ALL_GRID_CELLS, "SINGLE_LGR_ALL_GRID_CELLS", "One Single LGR for all Main Grid Cells");
setDefault(ExportLgr::NONE);
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -64,7 +52,7 @@ RicfExportLgrForCompletions::RicfExportLgrForCompletions()
RICF_InitField(&m_refinementI, "refinementI", -1, "RefinementI", "", "", "");
RICF_InitField(&m_refinementJ, "refinementJ", -1, "RefinementJ", "", "", "");
RICF_InitField(&m_refinementK, "refinementK", -1, "RefinementK", "", "", "");
RICF_InitField(&m_splitType, "splitType", LgrSplitType(ExportLgr::ONE_LGR_PER_GRID_CELL), "SplitType", "", "", "");
RICF_InitField(&m_splitType, "splitType", LgrSplitType(), "SplitType", "", "", "");
}
//--------------------------------------------------------------------------------------------------
@@ -107,7 +95,11 @@ void RicfExportLgrForCompletions::execute()
{
if (wellPath)
{
if (!feature->exportLgrsForWellPath(exportFolder, wellPath, eclipseCase, m_timeStep, lgrCellCounts, m_splitType == ExportLgr::SINGLE_LGR_ALL_GRID_CELLS))
try
{
feature->exportLgrsForWellPath(exportFolder, wellPath, eclipseCase, m_timeStep, lgrCellCounts, m_splitType());
}
catch(CreateLgrException e)
{
lgrIntersected = true;
}
@@ -20,20 +20,13 @@
#include "RicfCommandObject.h"
#include "ExportCommands/RicExportLgrUi.h"
#include "cafAppEnum.h"
#include "cafPdmField.h"
class RimWellPath;
namespace ExportLgr
{
enum SplitType
{
NONE,
ONE_LGR_PER_GRID_CELL,
SINGLE_LGR_ALL_GRID_CELLS
};
}
//==================================================================================================
//
@@ -44,7 +37,7 @@ class RicfExportLgrForCompletions : public RicfCommandObject
{
CAF_PDM_HEADER_INIT;
typedef caf::AppEnum<ExportLgr::SplitType> LgrSplitType;
typedef caf::AppEnum<RicExportLgrUi::SplitType> LgrSplitType;
public:
RicfExportLgrForCompletions();