diff -crBN src/CMakeLists.txt taudem-5.0/CMakeLists.txt *** src/CMakeLists.txt 1969-12-31 17:00:00.000000000 -0700 --- taudem-5.0/CMakeLists.txt 2010-07-19 14:19:34.000000000 -0600 *************** *** 0 **** --- 1,119 ---- + cmake_minimum_required(VERSION 2.6) + + #set (CMAKE_CXX_COMPILER mpicxx) + set (BUILD_SHARED_LIBS OFF) + + #SHAPEFILES includes all files in the shapefile library + #These should be compiled using the makefile in the shape directory + set (shape_srcs + shape/cell.cpp + shape/dbf.cpp + shape/exception.cpp + shape/field.cpp + shape/item.cpp + shape/point.cpp + shape/record.cpp + shape/shape.cpp + shape/shapefile.cpp + shape/shapemain.cpp + shape/shp_point.cpp + shape/shp_polygon.cpp + shape/shp_polyline.cpp + shape/ReadOutlets.cpp) + + #OBJFILES includes classes, structures, and constants common to all files + set (common_srcs commonLib.cpp tiffIO.cpp) + + set (D8FILES aread8mn.cpp aread8.cpp ${common_srcs} ${shape_srcs}) + set (DINFFILES areadinfmn.cpp areadinf.cpp ${common_srcs} ${shape_srcs}) + set (D8 D8FlowDirmn.cpp d8.cpp Node.cpp ${common_srcs} ${shape_srcs}) + set (D8EXTREAMUP D8flowpathextremeup.cpp D8FlowPathExtremeUpmn.cpp + ${common_srcs} ${shape_srcs}) + set (D8HDIST D8HDistToStrm.cpp D8HDistToStrmmn.cpp ${common_srcs}) + set (DINFAVA DinfAvalanche.cpp DinfAvalanchemn.cpp ${common_srcs}) + set (DINFCONCLIM DinfConcLimAccum.cpp DinfConcLimAccummn.cpp + ${common_srcs} ${shape_srcs}) + set (DINFDECAY dinfdecayaccum.cpp DinfDecayAccummn.cpp + ${common_srcs} ${shape_srcs}) + set (DINFDISTDOWN DinfDistDown.cpp DinfDistDownmn.cpp ${common_srcs}) + set (DINFDISTUP DinfDistUp.cpp DinfDistUpmn.cpp ${common_srcs}) + set (DINF DinfFlowDirmn.cpp dinf.cpp Node.cpp + ${common_srcs} ${shape_srcs}) + set (DINFREVACCUM DinfRevAccum.cpp DinfRevAccummn.cpp ${common_srcs}) + set (DINFTRANSLIMACCUM DinfTransLimAccum.cpp DinfTransLimAccummn.cpp + ${common_srcs} ${shape_srcs}) + set (DINFUPDEPEND DinfUpDependence.cpp DinfUpDependencemn.cpp ${common_srcs}) + set (DROPANALYSISFILES DropAnalysis.cpp DropAnalysismn.cpp + ${common_srcs} ${shape_srcs}) + set (GRIDNET gridnetmn.cpp gridnet.cpp + ${common_srcs} ${shape_srcs}) + set (LENGTHAREA LengthArea.cpp LengthAreamn.cpp ${common_srcs}) + set (MVOUTLETSTOSTRMFILES MoveOutletsToStrm.cpp MoveOutletsToStrmmn.cpp + ${common_srcs} ${shape_srcs}) + set (PEUKERDOUGLAS PeukerDouglas.cpp PeukerDouglasmn.cpp ${common_srcs}) + set (PITREMOVE flood.cpp PitRemovemn.cpp ${common_srcs}) + set (SLOPEAREA SlopeArea.cpp SlopeAreamn.cpp ${common_srcs}) + set (SLOPEAREARATIO SlopeAreaRatio.cpp SlopeAreaRatiomn.cpp ${common_srcs}) + set (SLOPEAVEDOWN SlopeAveDown.cpp SlopeAveDownmn.cpp ${common_srcs}) + set (STREAMNET streamnetmn.cpp streamnet.cpp + ${common_srcs} ${shape_srcs}) + set (THRESHOLD Threshold.cpp Thresholdmn.cpp ${common_srcs}) + #set (READTIFFILES ReadTif.cpp ReadTifmn.cpp ${common_srcs}) + + + add_executable (aread8 ${D8FILES}) + add_executable (areadinf ${DINFFILES}) + add_executable (d8flowdir ${D8}) + add_executable (d8flowpathextremeup ${D8EXTREAMUP}) + add_executable (d8hdisttostrm ${D8HDIST}) + add_executable (dinfavalanche ${DINFAVA}) + add_executable (dinfconclimaccum ${DINFCONCLIM}) + add_executable (dinfdecayaccum ${DINFDECAY}) + add_executable (dinfdistdown ${DINFDISTDOWN}) + add_executable (dinfdistup ${DINFDISTUP}) + add_executable (dinfflowdir ${DINF}) + add_executable (dinfrevaccum ${DINFREVACCUM}) + add_executable (dinftranslimaccum ${DINFTRANSLIMACCUM}) + add_executable (dinfupdependence ${DINFUPDEPEND}) + add_executable (dropanalysis ${DROPANALYSISFILES}) + add_executable (gridnet ${GRIDNET}) + add_executable (lengtharea ${LENGTHAREA}) + add_executable (moveoutletstostrm ${MVOUTLETSTOSTRMFILES}) + add_executable (peukerdouglas ${PEUKERDOUGLAS}) + add_executable (pitremove ${PITREMOVE}) + add_executable (slopearea ${SLOPEAREA}) + add_executable (slopearearatio ${SLOPEAREARATIO}) + add_executable (slopeavedown ${SLOPEAVEDOWN}) + add_executable (streamnet ${STREAMNET}) + add_executable (threshold ${THRESHOLD}) + #add_executable (ReadTif ${READTIFFILES}) + #add_executable (compare ${OBJFILES} compare.cpp) + #add_executable (extract ${OBJFILES} extract.cpp) + + install(TARGETS aread8 + areadinf + d8flowdir + d8flowpathextremeup + d8hdisttostrm + dinfavalanche + dinfconclimaccum + dinfdecayaccum + dinfdistdown + dinfdistup + dinfflowdir + dinfrevaccum + dinftranslimaccum + dinfupdependence + dropanalysis + gridnet + lengtharea + moveoutletstostrm + peukerdouglas + pitremove + slopearea + slopearearatio + slopeavedown + streamnet + threshold + DESTINATION bin) + diff -crBN src/linearpart.h taudem-5.0/linearpart.h *** src/linearpart.h 2010-06-23 16:30:40.000000000 -0600 --- taudem-5.0/linearpart.h 2010-07-19 14:17:32.000000000 -0600 *************** *** 44,49 **** --- 44,50 ---- #include #include #include + #include #include #ifndef LINEARPART_H #define LINEARPART_H diff -crBN src/makefile taudem-5.0/makefile *** src/makefile 2010-06-30 16:45:42.000000000 -0600 --- taudem-5.0/makefile 2010-07-19 14:09:24.000000000 -0600 *************** *** 76,82 **** READTIFFILES = ReadTif.o ReadTifmn.o $(OBJFILES) #The following are compiler flags common to all building rules ! CC = mpiCC CFLAGS=-O2 CFLAGS=-g -Wall CFLAGS=-g --- 76,82 ---- READTIFFILES = ReadTif.o ReadTifmn.o $(OBJFILES) #The following are compiler flags common to all building rules ! CC = mpicxx CFLAGS=-O2 CFLAGS=-g -Wall CFLAGS=-g Binary files src/shape/cell.o and taudem-5.0/shape/cell.o differ Binary files src/shape/dbf.o and taudem-5.0/shape/dbf.o differ Binary files src/shape/exception.o and taudem-5.0/shape/exception.o differ Binary files src/shape/field.o and taudem-5.0/shape/field.o differ Binary files src/shape/item.o and taudem-5.0/shape/item.o differ diff -crBN src/shape/makefile taudem-5.0/shape/makefile *** src/shape/makefile 2010-07-01 08:43:24.000000000 -0600 --- taudem-5.0/shape/makefile 2010-07-19 14:10:20.000000000 -0600 *************** *** 1,4 **** ! CC = mpiCC CFLAGS=-O2 all : cell.o dbf.o exception.o field.o item.o point.o record.o shape.o shapefile.o shapemain.o shp_point.o shp_polygon.o shp_polyline.o ReadOutlets.o --- 1,4 ---- ! CC = mpicxx CFLAGS=-O2 all : cell.o dbf.o exception.o field.o item.o point.o record.o shape.o shapefile.o shapemain.o shp_point.o shp_polygon.o shp_polyline.o ReadOutlets.o Binary files src/shape/point.o and taudem-5.0/shape/point.o differ Binary files src/shape/ReadOutlets.o and taudem-5.0/shape/ReadOutlets.o differ Binary files src/shape/record.o and taudem-5.0/shape/record.o differ Binary files src/shape/shapefile.o and taudem-5.0/shape/shapefile.o differ Binary files src/shape/shapemain.o and taudem-5.0/shape/shapemain.o differ Binary files src/shape/shape.o and taudem-5.0/shape/shape.o differ Binary files src/shape/shp_point.o and taudem-5.0/shape/shp_point.o differ Binary files src/shape/shp_polygon.o and taudem-5.0/shape/shp_polygon.o differ Binary files src/shape/shp_polyline.o and taudem-5.0/shape/shp_polyline.o differ diff -crBN src/tiffIO.cpp taudem-5.0/tiffIO.cpp *** src/tiffIO.cpp 2010-06-26 06:47:50.000000000 -0600 --- taudem-5.0/tiffIO.cpp 2010-07-19 14:16:20.000000000 -0600 *************** *** 40,45 **** --- 40,46 ---- #include #include + #include #include // See http://en.wikipedia.org/wiki/Stdint.h for details. #include #include "tiffIO.h"