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

Support Octave-4.0.0 on windows.(#325)

Browse Source 
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:
Jacob Støren 2015-06-30 21:38:33 +02:00
parent b2fb9ae2c8
commit 09d14c8ee2
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OctavePlugin/riGetCaseGroups.cpp
View File

@ -126,7 +126,7 @@ DEFUN_DLD (riGetCaseGroups, args, nargout,
// Build a map between the field name and field cell values // 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_CaseGroupId, cellValuesA);
m.assign(riOctavePlugin::caseGroupInfo_CaseGroupName, cellValuesB); m.assign(riOctavePlugin::caseGroupInfo_CaseGroupName, cellValuesB);

2
OctavePlugin/riGetCases.cpp
View File

@ -144,7 +144,7 @@ DEFUN_DLD (riGetCases, args, nargout,
// Build a map between the field name and field cell values // 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_CaseId, cellValuesA);
m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB); m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB);

10
OctavePlugin/riGetCurrentCase.cpp
View File

@ -95,12 +95,12 @@ DEFUN_DLD (riGetCurrentCase, args, nargout,
getCurrentCase(caseId, caseName, caseType, caseGroupId, "127.0.0.1", 40001); 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_CaseId, Cell(caseId));
fieldMap.assign(riOctavePlugin::caseInfo_CaseName, caseName.toLatin1().data()); fieldMap.assign(riOctavePlugin::caseInfo_CaseName, Cell(std::string(caseName.toLatin1().data()), true));
fieldMap.assign(riOctavePlugin::caseInfo_CaseType, caseType.toLatin1().data()); fieldMap.assign(riOctavePlugin::caseInfo_CaseType, Cell(std::string(caseType.toLatin1().data()), true));
fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, caseGroupId); fieldMap.assign(riOctavePlugin::caseInfo_CaseGroupId, Cell(caseGroupId));
retval = octave_value(fieldMap); retval = octave_value(fieldMap);
} }

2
OctavePlugin/riGetPropertyNames.cpp
View File

@ -158,7 +158,7 @@ DEFUN_DLD (riGetPropertyNames, args, nargout,
// Build a map between the field name and field cell values // 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_PropName, cellValuesB);
m.assign(riOctavePlugin::propertyInfo_PropType, cellValuesC); m.assign(riOctavePlugin::propertyInfo_PropType, cellValuesC);

2
OctavePlugin/riGetSelectedCases.cpp
View File

@ -134,7 +134,7 @@ DEFUN_DLD (riGetSelectedCases, args, nargout,
// Build a map between the field name and field cell values // 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_CaseId, cellValuesA);
m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB); m.assign(riOctavePlugin::caseInfo_CaseName, cellValuesB);

2
OctavePlugin/riGetTimeStepDates.cpp
View File

@ -165,7 +165,7 @@ DEFUN_DLD (riGetTimeStepDates, args, nargout,
// Build a map between the field name and field cell values // 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_Year, cellValuesA);
m.assign(riOctavePlugin::timeStepDate_Month, cellValuesB); m.assign(riOctavePlugin::timeStepDate_Month, cellValuesB);

2
OctavePlugin/riGetTimeStepDays.cpp
View File

@ -110,7 +110,7 @@ DEFUN_DLD (riGetTimeStepDays, args, nargout,
getTimeStepDates(decimalDays, caseId, "127.0.0.1", 40001); getTimeStepDates(decimalDays, caseId, "127.0.0.1", 40001);
dim_vector dv(2); dim_vector dv(2, 1);
dv(0) = decimalDays.size(); dv(0) = decimalDays.size();
dv(1) = 1; dv(1) = 1;
NDArray oct_decimalDays(dv); NDArray oct_decimalDays(dv);

2
OctavePlugin/riGetWellCells.cpp
View File

@ -249,7 +249,7 @@ DEFUN_DLD (riGetWellCells, args, nargout,
// Build a map between the field name and field cell values // 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_I, cellIscv );
m.assign(riOctavePlugin::wellCellInfo_J, cellJscv ); m.assign(riOctavePlugin::wellCellInfo_J, cellJscv );

2
OctavePlugin/riGetWellStatus.cpp
View File

@ -194,7 +194,7 @@ DEFUN_DLD (riGetWellStatus, args, nargout,
// Build a map between the field name and field cell values // 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_WellType, cellValuesB);
m.assign(riOctavePlugin::wellStatus_WellStatus, cellValuesC); m.assign(riOctavePlugin::wellStatus_WellStatus, cellValuesC);