Major rewrite of MSW export model

This commit is contained in:
Magne Sjaastad
2021-04-13 07:22:56 +02:00
parent 9ecfefe094
commit 63690d5196
65 changed files with 2766 additions and 2225 deletions

View File

@@ -562,12 +562,12 @@ void RifEclipseInputFileTools::saveFault( QString
}
QTextStream stream( &exportFile );
stream << "FAULTS" << endl;
stream << "FAULTS" << '\n';
stream << "-- Name I1 I2 J1 J2 K1 K2 Face ( I/J/K )" << endl;
stream << "-- Name I1 I2 J1 J2 K1 K2 Face ( I/J/K )" << '\n';
saveFault( stream, mainGrid, faultFaces, faultName, min, maxIn, refinement );
stream << "/" << endl;
stream << "/" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -744,9 +744,9 @@ void RifEclipseInputFileTools::saveFaults( QTextStream& stream,
const cvf::Vec3st& max /*= cvf::Vec3st::UNDEFINED*/,
const cvf::Vec3st& refinement /*= cvf::Vec3st(1, 1, 1)*/ )
{
stream << "FAULTS" << endl;
stream << "FAULTS" << '\n';
stream << "-- Name I1 I2 J1 J2 K1 K2 Face ( I/J/K )" << endl;
stream << "-- Name I1 I2 J1 J2 K1 K2 Face ( I/J/K )" << '\n';
const cvf::Collection<RigFault>& faults = mainGrid->faults();
for ( const auto& fault : faults )
@@ -757,7 +757,7 @@ void RifEclipseInputFileTools::saveFaults( QTextStream& stream,
saveFault( stream, mainGrid, fault->faultFaces(), fault->name(), min, max, refinement );
}
}
stream << "/" << endl;
stream << "/" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -1319,7 +1319,7 @@ void RifEclipseInputFileTools::writeFaultLine( QTextStream&
stream << "'" << faultName << "'"
<< " " << i << " " << i << " " << j << " " << j << " " << startK << " " << endK << " "
<< faultFaceText( faceType ) << " / ";
stream << endl;
stream << '\n';
}
//--------------------------------------------------------------------------------------------------

View File

@@ -62,7 +62,7 @@ bool RifStimPlanModelAsymmetricFrkExporter::writeToFile( RimStimPlanModel* stimP
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelAsymmetricFrkExporter::appendHeaderToStream( QTextStream& stream )
{
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl << "<asymmetric>" << endl;
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n' << "<asymmetric>" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -75,21 +75,21 @@ void RifStimPlanModelAsymmetricFrkExporter::appendBarrierDataToStream( QTextStre
double barrierDipDeg,
int wellPenetrationLayer )
{
stream << "<BedDipDeg>" << endl
<< bedDipDeg << endl
<< "</BedDipDeg>" << endl
<< "<Barrier>" << endl
<< static_cast<int>( hasBarrier ) << endl
<< "</Barrier>" << endl
<< "<BarrierDipDeg>" << endl
<< barrierDipDeg << endl
<< "</BarrierDipDeg>" << endl
<< "<DistanceToBarrier>" << endl
<< distanceToBarrier << endl
<< "</DistanceToBarrier>" << endl
<< "<WellPenetrationLayer>" << endl
<< wellPenetrationLayer << endl
<< "</WellPenetrationLayer>" << endl;
stream << "<BedDipDeg>" << '\n'
<< bedDipDeg << '\n'
<< "</BedDipDeg>" << '\n'
<< "<Barrier>" << '\n'
<< static_cast<int>( hasBarrier ) << '\n'
<< "</Barrier>" << '\n'
<< "<BarrierDipDeg>" << '\n'
<< barrierDipDeg << '\n'
<< "</BarrierDipDeg>" << '\n'
<< "<DistanceToBarrier>" << '\n'
<< distanceToBarrier << '\n'
<< "</DistanceToBarrier>" << '\n'
<< "<WellPenetrationLayer>" << '\n'
<< wellPenetrationLayer << '\n'
<< "</WellPenetrationLayer>" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -97,5 +97,5 @@ void RifStimPlanModelAsymmetricFrkExporter::appendBarrierDataToStream( QTextStre
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelAsymmetricFrkExporter::appendFooterToStream( QTextStream& stream )
{
stream << "</asymmetric>" << endl;
stream << "</asymmetric>" << '\n';
}

View File

@@ -75,7 +75,7 @@ bool RifStimPlanModelDeviationFrkExporter::writeToFile( RimStimPlanModel* stimPl
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelDeviationFrkExporter::appendHeaderToStream( QTextStream& stream )
{
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl << "<deviation>" << endl;
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n' << "<deviation>" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -86,23 +86,23 @@ void RifStimPlanModelDeviationFrkExporter::appendToStream( QTextStream&
const std::vector<double>& values )
{
stream.setRealNumberPrecision( 20 );
stream << "<cNamedSet>" << endl
<< "<name>" << endl
<< label << endl
<< "</name>" << endl
<< "<dimCount>" << endl
<< 1 << endl
<< "</dimCount>" << endl
<< "<sizes>" << endl
<< values.size() << endl
<< "</sizes>" << endl
<< "<data>" << endl;
stream << "<cNamedSet>" << '\n'
<< "<name>" << '\n'
<< label << '\n'
<< "</name>" << '\n'
<< "<dimCount>" << '\n'
<< 1 << '\n'
<< "</dimCount>" << '\n'
<< "<sizes>" << '\n'
<< values.size() << '\n'
<< "</sizes>" << '\n'
<< "<data>" << '\n';
for ( auto val : values )
{
stream << val << endl;
stream << val << '\n';
}
stream << "</data>" << endl << "</cNamedSet>" << endl;
stream << "</data>" << '\n' << "</cNamedSet>" << '\n';
}
//--------------------------------------------------------------------------------------------------
@@ -110,7 +110,7 @@ void RifStimPlanModelDeviationFrkExporter::appendToStream( QTextStream&
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelDeviationFrkExporter::appendFooterToStream( QTextStream& stream )
{
stream << "</deviation>" << endl;
stream << "</deviation>" << '\n';
}
//--------------------------------------------------------------------------------------------------

View File

@@ -234,7 +234,7 @@ bool RifStimPlanModelGeologicalFrkExporter::writeToCsvFile( const QString&
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelGeologicalFrkExporter::appendHeaderToStream( QTextStream& stream )
{
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl << "<geologic>" << endl;
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n' << "<geologic>" << endl;
}
//--------------------------------------------------------------------------------------------------
@@ -260,7 +260,7 @@ void RifStimPlanModelGeologicalFrkExporter::appendToStream( QTextStream&
stream << val << endl;
}
stream << "</data>" << endl << "</cNamedSet>" << endl;
stream << "</data>" << '\n' << "</cNamedSet>" << endl;
}
//--------------------------------------------------------------------------------------------------

View File

@@ -80,7 +80,7 @@ bool RifStimPlanModelPerfsFrkExporter::writeToFile( RimStimPlanModel* stimPlanMo
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelPerfsFrkExporter::appendHeaderToStream( QTextStream& stream )
{
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << endl << "<perfs>" << endl;
stream << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" << '\n' << "<perfs>" << endl;
}
//--------------------------------------------------------------------------------------------------
@@ -88,7 +88,7 @@ void RifStimPlanModelPerfsFrkExporter::appendHeaderToStream( QTextStream& stream
//--------------------------------------------------------------------------------------------------
void RifStimPlanModelPerfsFrkExporter::appendFractureOrientationToStream( QTextStream& stream, bool isTransverse )
{
stream << "<transverse>" << endl << static_cast<int>( isTransverse ) << endl << "</transverse>" << endl;
stream << "<transverse>" << '\n' << static_cast<int>( isTransverse ) << '\n' << "</transverse>" << endl;
}
//--------------------------------------------------------------------------------------------------