TUDelftGeodesy · avalentino · Aug 5, 2017 · Aug 5, 2017 · Aug 5, 2017 · Aug 5, 2017
diff --git a/bin/heightamb b/bin/heightamb
@@ -1,4 +1,4 @@
-#!/usr/bin/csh -f
+#!/bin/csh -f
 #%// BK 25-May-2000
 #%// $Revision: 1.1 $  $Date: 2005/07/28 09:27:00 $
 

diff --git a/bin/helpdoris b/bin/helpdoris
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 ##!/bin/ksh
 # processor.helpfile
 # simulate man like help for processor options

diff --git a/doris_core/Makefile b/doris_core/Makefile
@@ -44,7 +44,7 @@ SHELL   = /bin/sh
 
 ### Specify compiler/installation directory ###
 INSTALLDIR = /data/src/Doris_s1_git/bin
-CC	   = g++
+CXX	   = g++
 SCRIPTSDIR = ../bin
 
 ### Define statements controlling compilation ###
@@ -93,7 +93,7 @@ CFLAGS 	= $(CFLAGSOPT)
 ### Library locations flag ###
 ### -lcl : used for veclib 
 ### -lm  : used for fftw
-LFLAGS  =   -L/lib64 -lfftw3f -lm
+LFLAGS  =   -L/lib64 -lfftw3f -lm $(LDFLAGS)
 
 
 #####################################################
@@ -155,7 +155,7 @@ default:        $(EXECUTABLE)
 ### how to compile object code .o from C++ source files .cc (general rule) ###
 # space between -o and filename for SUN make (BK 7 july 2000)
 .cc.o:		
-		$(CC) $(CFLAGS) -c -o $(@) $<
+		$(CXX) $(CPPFLAGS) $(CFLAGS) -c -o $(@) $<
 
 #####################################################
 ### Make object code from source ###
@@ -170,7 +170,7 @@ swobjs:		$(SWOBJS)
 ### BK 07-Feb-2002
 $(EXECUTABLE):	$(SWOBJS) tmp_strptime.cc slcimage.cc productinfo.cc orbitbk.cc
 		$(CC) $(CFLAGS) -c -o triangle.o -DTRILIBRARY -DANSI_DECLARATORS triangle.c
-		$(CC) $(CFLAGS)\
+		$(CXX) $(CFLAGS)\
 		tmp_strptime.cc $(SWOBJS) triangle.o\
 		slcimage.cc productinfo.cc orbitbk.cc\
 		$(LFLAGS) -o $@
@@ -184,6 +184,7 @@ $(EXECUTABLE):	$(SWOBJS) tmp_strptime.cc slcimage.cc productinfo.cc orbitbk.cc
 ### Install executable in installdir ###
 install:	$(EXECUTABLE)
 		@echo "* Installing $(EXECUTABLE) in: $(INSTALLDIR)"
+		mkdir -p $(INSTALLDIR)
 		@cp -f $(EXECUTABLE) $(INSTALLDIR)/.
 		( cd $(SCRIPTSDIR); cp -f $(SCRIPTS) $(INSTALLDIR)/. )
 		$(MAKE) cleaner

diff --git a/doris_core/bk_messages.hh b/doris_core/bk_messages.hh
@@ -211,7 +211,7 @@ class bk_messages
       if (strlen(id)>=10)
         {
         strncpy(name_,id, 9);
-        strcat(name_,'\0');// terminate id
+        name_[9] = '\0';// terminate id
         }
       else
         {

diff --git a/doris_core/configure b/doris_core/configure
@@ -50,7 +50,7 @@ set key = $<
 
 
 # Declare variables.
-set CC          = ""
+set CXX         = ""
 set GppCOMPILER = n
 set FFTW        = n
 set VECLIB      = n
@@ -76,12 +76,12 @@ echo "   Using temp dir: $TMPDIR"
 
 
 # Get most likely compiler, first check g++
-foreach TMPCC ( g++ g++-3.4 g++-4.0 g++-4.1 g++-4.2 g++-4.3 CC aCC icpc )
+foreach TMPCC ( g++ g++-3.4 g++-4.0 g++-4.1 g++-4.2 g++-4.3 CXX CC aCC icpc )
   echo Checking compiler: \"$TMPCC\"...
   $TMPCC -v > & /dev/null
   if ( ! $status ) then
     echo "   I found a working(?) compiler: $TMPCC"
-    set CC = "$TMPCC"
+    set CXX = "$TMPCC"
     break
   endif
 end
@@ -91,7 +91,7 @@ end
 # Set flag for g++, this define enables some functions like sqr(int)
 # that are not standard C++, but were provided with, e.g., HP aCC compiler.
 #
-if ( "$CC" == "g++" ) set GppCOMPILER = "y"
+if ( "$CXX" == "g++" ) set GppCOMPILER = "y"
 
 
 #
@@ -119,7 +119,7 @@ int main()
   }
 __EOFDH
 echo "Compiling test program: $TSTPRG"
-$CC $TSTPRG.cc -o $TSTPRG > & /dev/null
+$CXX $TSTPRG.cc -o $TSTPRG > & /dev/null
 if ( $status != 0 ) then
   echo "   ---------------------------------------------------------------"
   echo "   Sorry, could not compile test program, continuing."
@@ -175,7 +175,7 @@ int main()
   }
 __EOFDH
 echo "Compiling test program: $TSTPRG"
-$CC $TSTPRG.cc -o $TSTPRG > & /dev/null
+$CXX $TSTPRG.cc -o $TSTPRG > & /dev/null
 if ( $status != 0 ) then
   echo "   function strptime not found in library, using internal definition."
   echo "   by define -D__NO_STRPTIME (change by editing DEF8 in $MAKEFILE)"
@@ -264,10 +264,10 @@ echo " "
 #
 # Interactive questions/check by user:
 #
-echo "===> What is your C++ compiler? [$CC] "
+echo "===> What is your C++ compiler? [$CXX] "
 set key = $<
-if ( "X$key" != "X" ) set CC = "$key"
-if ( "$CC" == "g++" ) set GppCOMPILER = y
+if ( "X$key" != "X" ) set CXX = "$key"
+if ( "$CXX" == "g++" ) set GppCOMPILER = y
 
 echo "===> Do you have the FFTW library (y/n)? [$FFTW] "
 set key = $<
@@ -390,7 +390,7 @@ end
 ###################################################
 echo " "
 echo " Creating Makefile for:"
-echo " compiler:       $CC"
+echo " compiler:       $CXX"
 echo " fftw:           $FFTW"
 if ( "$FFTW" == "y" ) echo " FFTW LIB DIR:     $FFTWLIBDIR"
 if ( "$FFTW" == "y" ) echo " FFTW INCLUDE DIR: $FFTWINCLDIR"
@@ -488,7 +488,7 @@ cat << __EOFHD > $MAKEFILE
 # If this does not work, try a more controlled approach by:		#
 #									#
 # 0. inspect set up of this Makefile					#
-# 1. set CC DEFS LIBS etc., first set these to debug values		#
+# 1. set CXX DEFS LIBS etc., first set these to debug values		#
 #    (read NOTE there if problems)					#
 # 2. compile software sources to *.o:     "make swobjs"			#
 # 3. link object together to executable:  "make doris"			#
@@ -511,14 +511,14 @@ cat << __EOFHD > $MAKEFILE
 #########################################################################
 ###################################################################
 ###################################################################
-# Please change if required: DEF[1-6], CC, CFLAGS, LIBDIR,      ###
+# Please change if required: DEF[1-6], CXX, CFLAGS, LIBDIR,     ###
 ###################################################################
 ### The shell used by this makefile ###
 SHELL   = /bin/sh
 
 ### Specify compiler/installation directory ###
 INSTALLDIR = $INSTALLDIR
-CC	   = $CC
+CXX	   = $CXX
 SCRIPTSDIR = ../bin
 
 ### Define statements controlling compilation ###
@@ -594,7 +594,7 @@ cat << __EOFHD >> $MAKEFILE
 ### Library locations flag ###
 ### -lcl : used for veclib 
 ### -lm  : used for fftw
-LFLAGS  = $LFLAGS
+LFLAGS  = $LFLAGS \$(LDFLAGS)
 
 
 #####################################################
@@ -656,7 +656,7 @@ default:        \$(EXECUTABLE)
 ### how to compile object code .o from C++ source files .cc (general rule) ###
 # space between -o and filename for SUN make (BK 7 july 2000)
 .cc.o:		
-		\$(CC) \$(CFLAGS) -c -o \$(@) \$<
+		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) -c -o \$(@) \$<
 
 #####################################################
 ### Make object code from source ###
@@ -671,7 +671,7 @@ swobjs:		\$(SWOBJS)
 ### BK 07-Feb-2002
 \$(EXECUTABLE):	\$(SWOBJS) tmp_strptime.cc slcimage.cc productinfo.cc orbitbk.cc
 		\$(CC) \$(CFLAGS) -c -o triangle.o -DTRILIBRARY -DANSI_DECLARATORS triangle.c
-		\$(CC) \$(CFLAGS)\
+		\$(CXX) \$(CPPFLAGS) \$(CFLAGS)\
 		tmp_strptime.cc \$(SWOBJS) triangle.o\
 		slcimage.cc productinfo.cc orbitbk.cc\
 		\$(LFLAGS) -o \$@
@@ -685,6 +685,7 @@ swobjs:		\$(SWOBJS)
 ### Install executable in installdir ###
 install:	\$(EXECUTABLE)
 		@echo "* Installing \$(EXECUTABLE) in: \$(INSTALLDIR)"
+		mkdir -p \$(INSTALLDIR)
 		@cp -f \$(EXECUTABLE) \$(INSTALLDIR)/.
 		( cd \$(SCRIPTSDIR); cp -f \$(SCRIPTS) \$(INSTALLDIR)/. )
 		\$(MAKE) cleaner
@@ -721,14 +722,14 @@ testdoris:	\$(EXECUTABLE)
 
 ### Orbit test program for debugging ###
 test-orbit:	ioroutines.o matrixspecs.o utilities.o exceptions.cc slcimage.cc orbitbk.cc matrixbk.cc bk_messages.hh
-		\$(CC) \$(CFLAGS) -D__TESTMAIN__ \
+		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) -D__TESTMAIN__ \
 		ioroutines.o matrixspecs.o utilities.o exceptions.cc slcimage.cc orbitbk.cc \
 		\$(LFLAGS) \
 		-o \$@
 ### Matrix test program for debugging ###
 ### fast_sin defined in utilities.cc, which requires ioroutines, which, etc.
 test-matrix:  matrix_test.cc matrixspecs.o utilities.o utilities.o ioroutines.o matrixbk.cc
-		\$(CC) \$(CFLAGS) matrix_test.cc matrixspecs.o \
+		\$(CXX) \$(CPPFLAGS) \$(CFLAGS) matrix_test.cc matrixspecs.o \
 		utilities.o ioroutines.o exceptions.cc orbitbk.cc \
 		\$(LFLAGS) \
 		-o \$@

diff --git a/doris_core/coregistration.cc b/doris_core/coregistration.cc
@@ -1363,7 +1363,7 @@ void mtiming_correl(
   int32 offsetLines  = -999; // NaN
   int32 offsetPixels = -999;
   //getoffset(Result,offsetLines,offsetPixels);   // getoffsets based on Mean
-  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurence
+  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurrence
 
 
   // ______ Convert offsets to seconds and write  master time offset to res file ______
@@ -1727,7 +1727,7 @@ void mtiming_correlfft(
   int32 offsetLines  = -999; // NaN
   int32 offsetPixels = -999;
   //getoffset(Result,offsetLines,offsetPixels);   // getoffsets based on Mean
-  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurence
+  getmodeoffset(Result,offsetLines,offsetPixels); // [MA] max occurrence
 
 
   // ______ Convert offsets to seconds and write master time offset to res file ______
@@ -2377,15 +2377,15 @@ cerr << endl;
                  << "\n* MTIMING_CORRELATION: Offset Frequency Table"
                  << "\n*******************************************************************"
                  << "\nUsing following data to determine coarse image offset:"
-                 << "\navg. coh    offset_L    offset_P  occurence  index"
+                 << "\navg. coh    offset_L    offset_P  occurrence  index"
                  << "\n------------------------------------------------------";  // TODO not yet: scratchlogfile << INFO
 
    // _____ Mode of offsets _____  [MA]
   PROGRESS.print("getmodeoffset: Start mode analysis ");
   PROGRESS << "Using as threshold:  " << thresh_coh << " and checking for mode value";
   PROGRESS.print();
   INFO.print("Using following data to determine coarse image offset:");
-  INFO.print("avg. coh    offset_L    offset_P  occurence  index");
+  INFO.print("avg. coh    offset_L    offset_P  occurrence  index");
   INFO.print("------------------------------------------------------");
 
   mysort231(sortResult);                        // re-sort on 2nd, 3rd than 1st column
@@ -2412,7 +2412,7 @@ cerr << endl;
          }
       offset_freq=0;   // reset
       offset_mcoh=0;
-      for (register uint j=0; j<nW; j++)           // scan data for occurences of an offset
+      for (register uint j=0; j<nW; j++)           // scan data for occurrences of an offset
         {                                          // for all offsets
          if ( L == int32(rint(sortResult(j,1))) && P == int32(rint(sortResult(j,2))) )
            {
@@ -2449,7 +2449,7 @@ cerr << endl;
     scratchlogfile << "\n\n*******************************************************************";
     scratchlogfile.close();  // close scratchlogmtiminghtr
 
-    // _____ Even occurence check _____
+    // _____ Even occurrence check _____
     if (mode_val == evenmode_val) // there are even values of mode.
       {
         WARNING << "There are " << nEven << " offset pairs which has equal mode values are equal.";
@@ -2471,7 +2471,7 @@ cerr << endl;
     }
   if (mode_val == 1)
     {
-    WARNING.print("getmodeoffset: all the offset occurence == 1. There is no mode value. ");
+    WARNING.print("getmodeoffset: all the offset occurrence == 1. There is no mode value. ");
     WARNING.print("(please check bottom of LOGFILE to see if offset is OK or change window size.)");
     }
   if (nW < 6)

diff --git a/doris_core/exceptions.cc b/doris_core/exceptions.cc
@@ -107,8 +107,8 @@ void handle_signal(int signum)
       break;
 #endif
     case SIGINT:
-      cout << "Caught SIGINT: User interupt signal." << endl;
-      cerr << "Caught SIGINT: User interupt signal." << endl;
+      cout << "Caught SIGINT: User interrupt signal." << endl;
+      cerr << "Caught SIGINT: User interrupt signal." << endl;
       exit(1);
       break;
     case SIGFPE:

diff --git a/doris_core/filtering.cc b/doris_core/filtering.cc
@@ -2010,7 +2010,7 @@ void azimuthfilter(
     {
     INFO << "Variation of fDC for master and slave < " << max_fdc_change;
     INFO.print();
-    INFO.print("Reseting Doppler polynomial to constant of center crop:");
+    INFO.print("Resetting Doppler polynomial to constant of center crop:");
     master.f_DC_a0 = master_fdc_p05;
     master.f_DC_a1 = 0.0;
     master.f_DC_a2 = 0.0;

diff --git a/doris_core/geocode.cc b/doris_core/geocode.cc
@@ -362,7 +362,7 @@ void slant2hschwabisch(
          << 100*(buffer-1)/(FULLBUFFERS+EXTRABUFFER) << "%";
     PROGRESS.print();
 
-    // ______ In original master coordinate sytem ______
+    // ______ In original master coordinate system ______
     const real8 firstline = veryfirstline + (buffer-1) * bufferlines * multiL;
 
     // ______ Set indices for loading / check last buffer ______