version 4.0.2 : LSF uninitialized variable bug, SDM updates

Jackdepac · Aug 26, 2019 · 8eed51a · 8eed51a
1 parent 5100643
commit 8eed51a
Show file tree

Hide file tree

Showing 5 changed files with 802 additions and 86 deletions.
diff --git a/Makefile b/Makefile
@@ -1,10 +1,14 @@
-TIFFPATH=$(HOME)/tiff-4.0.3-cray
-TIFFINC=-I$(TIFFPATH)/include
-TIFFLIB=-L$(TIFFPATH)/lib
-
-GEOTIFFPATH=$(HOME)/libgeotiff-1.4.2
-GEOTIFFINC=-I$(GEOTIFFPATH)/include
-GEOTIFFLIB=-L$(GEOTIFFPATH)/lib
+# If libtiff is installed in a nonstandard location you must edit
+# TIFFPATH and uncomment the following three lines.
+#TIFFPATH=$(HOME)/libtiff
+#TIFFINC=-I$(TIFFPATH)/include
+#TIFFLIB=-L$(TIFFPATH)/lib
+
+# If libgeotiff is installed in a nonstandard location you must edit
+# GEOTIFFPATH and uncomment the following three lines.
+#GEOTIFFPATH=$(SETSMHOME)/libgeotiff-1.4.2
+#GEOTIFFINC=-I$(GEOTIFFPATH)/include
+#GEOTIFFLIB=-L$(GEOTIFFPATH)/lib
 
 MPIFLAGS = -DBUILDMPI
 
@@ -66,4 +70,3 @@ $(OBJS) : $(HDRS)
 clean :
 	rm -f setsm setsm_mpi
 	rm -f *.o
-
diff --git a/Typedefine.hpp b/Typedefine.hpp
@@ -24,7 +24,7 @@
 #define RadToDeg 180/PI
 #define UMToMM 0.001
 #define MMToUM 1000
-#define MaxImages 10
+#define MaxImages 3
 
 #ifndef bool
 //#define bool unsigned char
@@ -229,6 +229,9 @@ typedef struct ProjectInfo{
     int number_of_images;
     enum SensorType sensor_type; // 1 is for RFM (default), 2 is for Collinear Equation (Frame)
     uint8 pyramid_level;
+    uint8 SDM_SS;
+    double SDM_AS;
+    int SDM_days;
 
 	char Imagefilename[MaxImages][500];
 	char RPCfilename[MaxImages][500];
@@ -301,6 +304,9 @@ typedef struct ArgumentInfo{
     int RA_only;
     int number_of_images; // 2 is for stereo (default), n is for multi more than 3
     uint8 pyramid_level;
+    uint8 SDM_SS;
+    int SDM_days;
+    double SDM_AS;
 
     char Image[MaxImages][500];
 	char Outputpath[500];

diff --git a/basic_topology_types.hpp b/basic_topology_types.hpp
@@ -46,7 +46,7 @@ inline bool LessThanXY(const GridPoint &a, const GridPoint &b) { return (a.col <
 // Compare function to sort by y/row then x/col
 inline bool LessThanYX(const GridPoint &a, const GridPoint &b) { return (a.row < b.row) || ((a.row == b.row) && (a.col > b.col)); } 
 // Conversion functions from GridPoint to linear index and vice versa
-inline GridPoint Convert(std::size_t index, INDEX width) { GridPoint p = { index / width, index % width }; return p; }
+inline GridPoint Convert(std::size_t index, INDEX width) { GridPoint p = { (int)(index / width), (int)(index % width) }; return p; }
 inline std::size_t Convert(const GridPoint &p, INDEX width) { return p.row * width + p.col; }
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////