fix compile issues on linux

Author: dicengine

src/base/DICe.cpp

@@ -42,7 +42,7 @@
 #include <DICe.h>
 
 #include <iostream>
-#include <string>
+#include <string.h>
 
 #if DICE_MPI
   #include <mpi.h>

src/base/DICe_LocalShapeFunction.cpp

@@ -406,7 +406,7 @@ Affine_Shape_Function::high_order_terms(const scalar_t & x,
   const bool use_ref_grads){
   assert((int_t)high_order_terms.size()==4);
 
-  static scalar_t dx=0.0,dy=0.0,Dx=0.0,Dy=0.0,delTheta=0.0,delEx=0.0,delEy=0.0,delGxy=0.0;
+  static scalar_t dx=0.0,dy=0.0,Dx=0.0,Dy=0.0;
   static scalar_t Gx=0.0,Gy=0.0;
   static scalar_t theta=0.0,dudx=0.0,dvdy=0.0,gxy=0.0,cosTheta=0.0,sinTheta=0.0;
   theta = has_rotz_ ? parameters_[rotz_ind_] : 0.0;
@@ -423,12 +423,6 @@ Affine_Shape_Function::high_order_terms(const scalar_t & x,
   Gx = use_ref_grads ? cosTheta*gx - sinTheta*gy : gx;
   Gy = use_ref_grads ? sinTheta*gx + cosTheta*gy : gy;
 
-  delTheta = Gx*(-sinTheta*Dx - cosTheta*Dy) + Gy*(cosTheta*Dx - sinTheta*Dy);
-  //deldelTheta = Gx*(-cosTheta*Dx + sinTheta*Dy) + Gy*(-sinTheta*Dx - cosTheta*Dy);
-  delEx = Gx*dx*cosTheta + Gy*dx*sinTheta;
-  delEy = -Gx*dy*sinTheta + Gy*dy*cosTheta;
-  delGxy = Gx*(cosTheta*dy - sinTheta*dx) + Gy*(sinTheta*dy + cosTheta*dx);
-
   high_order_terms[0] = Gx*(sinTheta*Dy - cosTheta*Dx) + Gy*(-1.0*sinTheta*Dx - cosTheta*Dy);
   high_order_terms[1] = Gy*cosTheta*dx - Gx*sinTheta*dx;
   high_order_terms[2] = -1.0*Gx*cosTheta*dy - Gy*sinTheta*dy;

src/core/DICe_Schema.cpp

@@ -3026,7 +3026,7 @@ Schema::march_from_neighbor_init(const Direction & neighbor_direction,
     scalar_t subset_x = neigh_x;
     scalar_t subset_y = neigh_y;
     scalar_t cross_gamma = 0.0, cross_sigma = 0.0;
-    Status_Flag corr_status;
+    Status_Flag corr_status = CORRELATION_FAILED;
     Teuchos::RCP<Objective> obj;
     std::vector<scalar_t> save_params(sf->num_params(),0.0);
     for(int_t ix=0;ix<=num_steps_x;++ix){
@@ -3200,13 +3200,13 @@ Schema::initialize_cross_correlation(Teuchos::RCP<Triangulation> tri,
 	  // do a feature matching on the rectified images
 
     float feature_epi_dist_tol = 0.5f;
-    float epi_dist_tol = 0.5f;
+    //float epi_dist_tol = 0.5f;
     if(tri->avg_epipolar_error()!=0.0){
       feature_epi_dist_tol = 3.0*tri->avg_epipolar_error();
-      epi_dist_tol = 3.0*tri->avg_epipolar_error();
+      //epi_dist_tol = 3.0*tri->avg_epipolar_error();
     }
     DEBUG_MSG("Schema::initialize_cross_correlation(): feature epi dist tol: " << feature_epi_dist_tol);
-    DEBUG_MSG("Schema::initialize_cross_correlation(): epi dist tol: " << epi_dist_tol);
+    //DEBUG_MSG("Schema::initialize_cross_correlation(): epi dist tol: " << epi_dist_tol);
     Teuchos::RCP<DICe::Image> left_image = Teuchos::rcp(new Image(outname_left.c_str(),imgParams));
     Teuchos::RCP<DICe::Image> right_image = Teuchos::rcp(new Image(outname_right.c_str(),imgParams));