Commit 55079275 authored by Dave Moxey's avatar Dave Moxey

Fixed compiler warning with FldCalcBCs.

Fixed warnings from CMake when Macports zlib is used.

git-svn-id: https://gforge.sci.utah.edu/svn/nektar/trunk@3841 305cdda6-5ce1-45b3-a98d-dfc68c8b3305
parent ecf1a048
......@@ -16,13 +16,25 @@ IF (THIRDPARTY_BUILD_ZLIB)
SET(Boost_ZLIB_LIBRARY_DEBUG z)
SET(Boost_ZLIB_LIBRARY_RELEASE z)
ELSE (THIRDPARTY_BUILD_ZLIB)
# Find a system ZLIB library and use that instead
# Attempt to identify Macports libraries, if they exist. This prevents
# cmake warnings later on.
IF (APPLE)
FIND_LIBRARY(ZLIB_LIBRARY z PATHS /opt/local/lib NO_DEFAULT_PATH)
ENDIF()
# Find a system ZLIB library and use that instead
IF (ZLIB_LIBRARY-NOTFOUND OR NOT APPLE)
FIND_PACKAGE( ZLIB )
IF (ZLIB_FOUND)
SET(Boost_ZLIB_LIBRARY ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARIES})
SET(Boost_ZLIB_LIBRARY_DEBUG ${ZLIB_LIBRARIES})
SET(ZLIB_LIBRARY ${ZLIB_LIBRARIES})
ENDIF()
ENDIF()
IF (ZLIB_LIBRARY)
SET(Boost_ZLIB_LIBRARY ${ZLIB_LIBRARY})
SET(Boost_ZLIB_LIBRARY_RELEASE ${ZLIB_LIBRARY})
SET(Boost_ZLIB_LIBRARY_DEBUG ${ZLIB_LIBRARY})
ENDIF()
ENDIF (THIRDPARTY_BUILD_ZLIB)
......@@ -32,7 +32,7 @@ IF (NEKTAR_USE_ARPACK)
DriverArpack.h)
ENDIF (NEKTAR_USE_ARPACK)
ADD_DEFINITIONS(-DSOLVER_UTILS_EXPORT)
ADD_DEFINITIONS(-DSOLVER_UTILS_EXPORTS)
ADD_NEKTAR_LIBRARY(SolverUtils lib ${NEKTAR_LIBRARY_TYPE} ${SOLVER_UTILS_SOURCES} ${SOLVER_UTILS_HEADERS})
TARGET_LINK_LIBRARIES(SolverUtils
......
......@@ -43,5 +43,5 @@
#define SOLVER_UTILS_EXPORT
#endif
#endif //NEKTAR_MULTI_REGIONS_DECLSPEC_H
#endif //NEKTAR_SOLVER_UTILS_DECLSPEC_H
......@@ -197,13 +197,14 @@ cout<<"set ppp"<<endl;
// Copy data from file:fill fields with the fielddata
if(lastfield==1)
{
for(int i = 0; i < fielddata.size(); ++i)
int i;
for(i = 0; i < fielddata.size(); ++i)
{
fields[0]->ExtractDataToCoeffs(fielddef[i],fielddata[i],fielddef[i]->m_fields[0]);
}
fields[0]->BwdTrans(fields[0]->GetCoeffs(),fields[0]->UpdatePhys());
cout<<"field:"<<fielddef[i]->m_fields[0]<<endl;
for(int i = 0; i < fielddata.size(); ++i)
for(i = 0; i < fielddata.size(); ++i)
{
fields[lastfield]->ExtractDataToCoeffs(fielddef[i],fielddata[i],fielddef[i]->m_fields[0]);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment