ortho openxml bug fixed

Makefile

@@ -4,23 +4,20 @@
 
 # If libtiff is installed in a nonstandard location you must edit 
 # TIFFPATH and uncomment the following three lines.
-
-TIFFPATH=/projects/sciteam/bazu/setsm/lib/tiff-4.0.3-cray
-TIFFINC=-I$(TIFFPATH)/include
-TIFFLIB=-L$(TIFFPATH)/lib
+TIFFPATH=/home/noh.56/software/tiff-4.0.3/libtiff
+TIFFINC=-I/home/noh.56/software/tiff-4.0.3/include
+TIFFLIB=-L/home/noh.56/software/tiff-4.0.3/lib
 
 # If libgeotiff is installed in a nonstandard location you must edit
 # GEOTIFFPATH and uncomment the following three lines.
-GEOTIFFPATH=/projects/sciteam/bazu/setsm/lib/geotiff
-GEOTIFFINC=-I$(GEOTIFFPATH)/include
-GEOTIFFLIB=-L$(GEOTIFFPATH)/lib
-
-PROJLIB=-L/projects/sciteam/bazu/setsm/lib/proj/lib
+GEOTIFFPATH=/home/noh.56/software/libgeotiff-1.4.2/libxtiff
+GEOTIFFINC=-I/home/noh.56/software/libgeotiff-1.4.2/include
+GEOTIFFLIB=-L/home/noh.56/software/libgeotiff-1.4.2/lib
 
 MPIFLAGS = -DBUILDMPI
 
 INCS = $(TIFFINC) $(GEOTIFFINC)
-LDFLAGS = $(TIFFLIB) $(GEOTIFFLIB) $(PROJLIB)
+LDFLAGS = $(TIFFLIB) $(GEOTIFFLIB)
 
 OBJS = setsmgeo.o grid.o grid_triangulation.o edge_list.o
 HDRS = Typedefine.hpp setsm_code.hpp setsmgeo.hpp grid_triangulation.hpp grid_types.hpp grid_iterators.hpp basic_topology_types.hpp git_description.h
@@ -39,19 +36,12 @@ else ifeq ($(COMPILER), pgi)
   MPICXX=mpicxx
   CFLAGS=-c99 -O3 -mp=allcores -fast
   CXXFLAGS=-std=c++11 -O3 -mp=allcores -fast
-else ifeq ($(COMPILER), cray)
-  CC=cc
-  CXX=CC
-  MPICC=mpicc
-  MPICXX=mpicxx
-  CFLAGS=
-  CXXFLAGS=-hstd=c++11
 else
   CC=gcc
   CXX=g++
   MPICC=mpicc
   MPICXX=mpicxx
-  CFLAGS=-std=c99 -O3 -fopenmp 
+  CFLAGS=-std=c99 -g -O3 -fopenmp 
   CXXFLAGS=-std=c++11 -O3 -fopenmp 
 endif
 
@@ -60,10 +50,10 @@ GIT_DESCRIPTION:=$(shell cat git_description)
 export GIT_DESCRIPTION
 
 setsm : setsm_code.o $(OBJS)
-	$(CXX) $(CXXFLAGS) -o setsm setsm_code.o $(OBJS) $(LDFLAGS) -lm -lgeotiff -ltiff -lz -ljpeg -lproj
+	$(CXX) $(CXXFLAGS) -o setsm setsm_code.o $(OBJS) $(LDFLAGS) -lm -lgeotiff -ltiff
 
 setsm_mpi : setsm_code_mpi.o $(OBJS)
-	$(MPICXX) $(CXXFLAGS) $(MPIFLAGS) -o setsm_mpi setsm_code_mpi.o $(OBJS) $(LDFLAGS) -lm -lgeotiff -ltiff -lz -ljpeg -lproj
+	$(MPICXX) $(CXXFLAGS) $(MPIFLAGS) -o setsm_mpi setsm_code_mpi.o $(OBJS) $(LDFLAGS) -lm -lgeotiff -ltiff
 
 setsm_code.o : setsm_code.cpp $(HDRS)
 	$(CXX) -c $(CXXFLAGS) $(INCS) setsm_code.cpp -o setsm_code.o
@@ -83,8 +73,7 @@ $(OBJS) : $(HDRS)
 
 clean :
 	rm -f setsm setsm_mpi
-	rm -f *.o git_description.h
+	rm -f *.o git_description git_description.h
 
 git_description.h: git_description
 	echo "#define GIT_DESCRIPTION \"$(GIT_DESCRIPTION)\"" > $@
-