mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Support Octave-4.0.0 on windows.(#325)
The modifications is also working in the old 3.6.1 version of octave, so they should be good in the versions between too.
This commit is contained in:
parent
b2fb9ae2c8
commit
09d14c8ee2
@ -126,7 +126,7 @@ DEFUN_DLD (riGetCaseGroups, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::caseGroupInfo_CaseGroupId, cellValuesA);
|
||||
m.assign(riOctavePlugin::caseGroupInfo_CaseGroupName, cellValuesB);
|
||||
|
@ -144,7 +144,7 @@ DEFUN_DLD (riGetCases, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::caseInfo_CaseId, cellValuesA);
|
||||
m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB);
|
||||
|
@ -95,12 +95,12 @@ DEFUN_DLD (riGetCurrentCase, args, nargout,
|
||||
|
||||
getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001);
|
||||
|
||||
Octave_map fieldMap;
|
||||
octave_map fieldMap;
|
||||
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseId, caseId);
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseName, caseName.toLatin1().data());
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseType, caseType.toLatin1().data());
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, caseGroupId);
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseId, Cell(caseId));
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseName, Cell(std::string(caseName.toLatin1().data()), true));
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseType, Cell(std::string(caseType.toLatin1().data()), true));
|
||||
fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, Cell(caseGroupId));
|
||||
|
||||
retval = octave_value(fieldMap);
|
||||
}
|
||||
|
@ -158,7 +158,7 @@ DEFUN_DLD (riGetPropertyNames, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::propertyInfo_PropName, cellValuesB);
|
||||
m.assign(riOctavePlugin::propertyInfo_PropType, cellValuesC);
|
||||
|
@ -134,7 +134,7 @@ DEFUN_DLD (riGetSelectedCases, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::caseInfo_CaseId, cellValuesA);
|
||||
m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB);
|
||||
|
@ -165,7 +165,7 @@ DEFUN_DLD (riGetTimeStepDates, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::timeStepDate_Year, cellValuesA);
|
||||
m.assign(riOctavePlugin::timeStepDate_Month, cellValuesB);
|
||||
|
@ -110,7 +110,7 @@ DEFUN_DLD (riGetTimeStepDays, args, nargout,
|
||||
|
||||
getTimeStepDates(decimalDays, caseId, "127.0.0.1", 40001);
|
||||
|
||||
dim_vector dv(2);
|
||||
dim_vector dv(2, 1);
|
||||
dv(0) = decimalDays.size();
|
||||
dv(1) = 1;
|
||||
NDArray oct_decimalDays(dv);
|
||||
|
@ -249,7 +249,7 @@ DEFUN_DLD (riGetWellCells, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::wellCellInfo_I, cellIscv );
|
||||
m.assign(riOctavePlugin::wellCellInfo_J, cellJscv );
|
||||
|
@ -194,7 +194,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout,
|
||||
|
||||
// Build a map between the field name and field cell values
|
||||
|
||||
Octave_map m;
|
||||
octave_map m;
|
||||
|
||||
m.assign(riOctavePlugin::wellStatus_WellType, cellValuesB);
|
||||
m.assign(riOctavePlugin::wellStatus_WellStatus, cellValuesC);
|
||||
|
Loading…
Reference in New Issue
Block a user