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

AppFwk : Activate more warnings

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-27 21:27:34 +02:00
parent 66dd318d67
commit b584ab905c
10 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@@ -62,4 +62,8 @@ target_link_libraries ( ${PROJECT_NAME}
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

36
Fwk/AppFwk/CommonCode/cvfStructGrid.cpp
View File

@@ -249,9 +249,9 @@ void StructGridInterface::characteristicCellSizes(double* iSize, double* jSize,
ubyte faceConnNegK[4]; ubyte faceConnNegK[4];
cellFaceVertexIndices(StructGridInterface::NEG_K, faceConnNegK); cellFaceVertexIndices(StructGridInterface::NEG_K, faceConnNegK);
double iSize = 0.0; double iLengthAccumulated = 0.0;
double jSize = 0.0; double jLengthAccumulated = 0.0;
double kSize = 0.0; double kLengthAccumulated = 0.0;
cvf::Vec3d cornerVerts[8]; cvf::Vec3d cornerVerts[8];
size_t cellCount = 0; size_t cellCount = 0;
@@ -270,20 +270,20 @@ void StructGridInterface::characteristicCellSizes(double* iSize, double* jSize,
size_t cellIndex = cellIndexFromIJK(i, j, k); size_t cellIndex = cellIndexFromIJK(i, j, k);
cellCornerVertices(cellIndex, cornerVerts); cellCornerVertices(cellIndex, cornerVerts);
iSize += (cornerVerts[faceConnPosI[0]] - cornerVerts[faceConnNegI[0]]).lengthSquared(); iLengthAccumulated += (cornerVerts[faceConnPosI[0]] - cornerVerts[faceConnNegI[0]]).lengthSquared();
iSize += (cornerVerts[faceConnPosI[1]] - cornerVerts[faceConnNegI[3]]).lengthSquared(); iLengthAccumulated += (cornerVerts[faceConnPosI[1]] - cornerVerts[faceConnNegI[3]]).lengthSquared();
iSize += (cornerVerts[faceConnPosI[2]] - cornerVerts[faceConnNegI[2]]).lengthSquared(); iLengthAccumulated += (cornerVerts[faceConnPosI[2]] - cornerVerts[faceConnNegI[2]]).lengthSquared();
iSize += (cornerVerts[faceConnPosI[3]] - cornerVerts[faceConnNegI[1]]).lengthSquared(); iLengthAccumulated += (cornerVerts[faceConnPosI[3]] - cornerVerts[faceConnNegI[1]]).lengthSquared();
jSize += (cornerVerts[faceConnPosJ[0]] - cornerVerts[faceConnNegJ[0]]).lengthSquared(); jLengthAccumulated += (cornerVerts[faceConnPosJ[0]] - cornerVerts[faceConnNegJ[0]]).lengthSquared();
jSize += (cornerVerts[faceConnPosJ[1]] - cornerVerts[faceConnNegJ[3]]).lengthSquared(); jLengthAccumulated += (cornerVerts[faceConnPosJ[1]] - cornerVerts[faceConnNegJ[3]]).lengthSquared();
jSize += (cornerVerts[faceConnPosJ[2]] - cornerVerts[faceConnNegJ[2]]).lengthSquared(); jLengthAccumulated += (cornerVerts[faceConnPosJ[2]] - cornerVerts[faceConnNegJ[2]]).lengthSquared();
jSize += (cornerVerts[faceConnPosJ[3]] - cornerVerts[faceConnNegJ[1]]).lengthSquared(); jLengthAccumulated += (cornerVerts[faceConnPosJ[3]] - cornerVerts[faceConnNegJ[1]]).lengthSquared();
kSize += (cornerVerts[faceConnPosK[0]] - cornerVerts[faceConnNegK[0]]).lengthSquared(); kLengthAccumulated += (cornerVerts[faceConnPosK[0]] - cornerVerts[faceConnNegK[0]]).lengthSquared();
kSize += (cornerVerts[faceConnPosK[1]] - cornerVerts[faceConnNegK[3]]).lengthSquared(); kLengthAccumulated += (cornerVerts[faceConnPosK[1]] - cornerVerts[faceConnNegK[3]]).lengthSquared();
kSize += (cornerVerts[faceConnPosK[2]] - cornerVerts[faceConnNegK[2]]).lengthSquared(); kLengthAccumulated += (cornerVerts[faceConnPosK[2]] - cornerVerts[faceConnNegK[2]]).lengthSquared();
kSize += (cornerVerts[faceConnPosK[3]] - cornerVerts[faceConnNegK[1]]).lengthSquared(); kLengthAccumulated += (cornerVerts[faceConnPosK[3]] - cornerVerts[faceConnNegK[1]]).lengthSquared();
cellCount++; cellCount++;
} }
@@ -295,9 +295,9 @@ void StructGridInterface::characteristicCellSizes(double* iSize, double* jSize,
if (divisor > 0.0) if (divisor > 0.0)
{ {
m_characteristicCellSizeI = cvf::Math::sqrt(iSize / divisor); m_characteristicCellSizeI = cvf::Math::sqrt(iLengthAccumulated / divisor);
m_characteristicCellSizeJ = cvf::Math::sqrt(jSize / divisor); m_characteristicCellSizeJ = cvf::Math::sqrt(jLengthAccumulated / divisor);
m_characteristicCellSizeK = cvf::Math::sqrt(kSize / divisor); m_characteristicCellSizeK = cvf::Math::sqrt(kLengthAccumulated / divisor);
} }
} }

4
Fwk/AppFwk/cafAnimControl/CMakeLists.txt
View File

@@ -47,4 +47,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

4
Fwk/AppFwk/cafCommand/CMakeLists.txt
View File

@@ -70,4 +70,8 @@ target_link_libraries ( ${PROJECT_NAME}
cafProjectDataModel cafProjectDataModel
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

4
Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
View File

@@ -31,4 +31,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

4
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
View File

@@ -60,4 +60,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

4
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
View File

@@ -72,4 +72,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

6
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/cafPdmUiCommandSystemProxy.cpp
View File

@@ -118,10 +118,10 @@ void PdmUiCommandSystemProxy::setUiValueToField(PdmUiFieldHandle* uiFieldHandle,
{ {
// Todo Remove when dust has settled. Selection manager is not supposed to select single fields // Todo Remove when dust has settled. Selection manager is not supposed to select single fields
// A field is selected, check if keywords are identical // A field is selected, check if keywords are identical
PdmUiFieldHandle* uiFieldHandle = dynamic_cast<PdmUiFieldHandle*>(items[i]); PdmUiFieldHandle* itemFieldHandle = dynamic_cast<PdmUiFieldHandle*>(items[i]);
if (uiFieldHandle) if (itemFieldHandle)
{ {
PdmFieldHandle* field = uiFieldHandle->fieldHandle(); PdmFieldHandle* field = itemFieldHandle->fieldHandle();
if (field && field != editorField && field->keyword() == editorField->keyword()) if (field && field != editorField && field->keyword() == editorField->keyword())
{ {
fieldsToUpdate.push_back(field); fieldsToUpdate.push_back(field);

4
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
View File

@@ -53,4 +53,8 @@ target_include_directories(${PROJECT_NAME}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})

4
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@@ -52,4 +52,8 @@ target_link_libraries ( ${PROJECT_NAME}
${QT_LIBRARIES} ${QT_LIBRARIES}
) )
if (MSVC)
set_target_properties(${PROJECT_NAME} PROPERTIES COMPILE_FLAGS "/W4 /wd4100 /wd4127")
endif()
source_group("" FILES ${PROJECT_FILES}) source_group("" FILES ${PROJECT_FILES})