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

Merge pull request #17 from hegge/build-system-fixes

Browse Source 
Minor build system fixes, gitignore and compiler warning
This commit is contained in:
Magne Sjaastad 2013-04-03 00:17:39 -07:00
commit 99fcb435ed
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitignore vendored
View File

@ -4,6 +4,7 @@
# compiler output
*.o
*.a
# Octave plugins (compiled)
*.oct
@ -21,6 +22,13 @@ CMakeFiles/
CMakeCache.txt
/Generated/
*.qrc.depends
cmake_install.cmake
CPack*.cmake
CTest*.cmake
#Unit test binaries
*_UnitTests
!*_UnitTests/
# Target program
/ApplicationCode/ResInsight

2
OctavePlugin/riGetActiveCellInfo.cpp
View File

@ -52,7 +52,7 @@ void getActiveCellInfo(int32NDArray& activeCellInfo, const QString &hostName, qu
activeCellCount = byteCount / sizeof(qint32);
dim_vector dv (2);
dim_vector dv (2, 1);
dv(0) = activeCellCount;
dv(1) = timestepCount;
activeCellInfo.resize(dv);

2
OctavePlugin/riGetMainGridDimensions.cpp
View File

@ -51,7 +51,7 @@ void getMainGridDimensions(int32NDArray& gridDimensions, const QString &hostName
socketStream >> jCount;
socketStream >> kCount;
dim_vector dv (1);
dim_vector dv (1, 1);
dv(0) = 3;
gridDimensions.resize(dv);

3
ThirdParty/Ert/devel/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
/lib/
ert_build_config.h
*_vector.[ch]