Merge branch 'gmtsar:master' into master

AlexeyPechnikov · Sep 10, 2023 · f5b805c · f5b805c
2 parents 397bb2c + 811ea50
commit f5b805c
Show file tree

Hide file tree

Showing 36 changed files with 1,168 additions and 103 deletions.
diff --git a/.gitignore b/.gitignore
@@ -232,6 +232,10 @@ preproc/S1A_preproc/src_tops/make_s1a_tops_6par
 preproc/S1A_preproc/src_tops/make_s1a_tops_6par.o
 preproc/TSX_preproc/src/make_slc_tsx
 preproc/TSX_preproc/src/make_slc_tsx.o
+preproc/NSR_preproc/include
+preproc/NSR_preproc/lib
+preproc/NSR_preproc/src_slc/make_slc_nsr
+preproc/NSR_preproc/src_slc/make_slc_nsr.o
 share/
 snaphu/src/snaphu
 snaphu/src/snaphu.o

diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ sinclude config.mk
 # Currently, S1A must happen before the CSK, TSZ, and RS2 builds due to dependencies via links
 # We will fix this so one can make anyting in any order
 #
-PREPROCESSORS	= ALOS ERS S1A CSK TSX RS2 ENVI GF3 NSR
+PREPROCESSORS	= ALOS ERS S1A CSK TSX RS2 ENVI GF3 NSR LT1 
 #
 DIRS		= gmtsar snaphu/src
 ORBITS_URL	= http://topex.ucsd.edu/gmtsar/tar/ORBITS.tar

diff --git a/configure.ac b/configure.ac
@@ -25,7 +25,7 @@ dnl 1. Location of GMT include and library files
 dnl 2. Location of ORBITS directory
 dnl ------------------------------------------------------------------
 dnl
-AC_INIT([GMTSAR],[5.5.0],[[email protected]])
+AC_INIT([GMTSAR],[6.2.0],[[email protected]])
 dnl
 dnl ------------------------------------------------------------------
 dnl The remainder should need no editing

diff --git a/gmtsar/PRM.h b/gmtsar/PRM.h
@@ -36,9 +36,9 @@ struct PRM {
 	int rec_start;
 	int rec_stop;
 	int SC_identity;  /* (1)-ERS1 (2)-ERS2 (3)-Radarsat (4)-Envisat (5)-ALOS
-	                     (6)-Envisat_SLC  (7)-TSX (8)-CSK (9)-RS2 (10)-S1A (11)-GF3 */
+	                     (6)-Envisat_SLC  (7)-TSX (8)-CSK (9)-RS2 (10)-S1A (11)-GF3 (12)-LT1 */
 	int ref_identity; /* (1)-ERS1 (2)-ERS2 (3)-Radarsat (4)-Envisat (5)-ALOS (6)-
-	                     (7)-TSX (8)-CSK (9)-RS2 (10)-S1A (11)-GF3*/
+	                     (7)-TSX (8)-CSK (9)-RS2 (10)-S1A (11)-GF3 (12)-LT1 */
 	int nrows;
 	int num_lines;
 	int SLC_format; /* 1 => complex ints (2 bytes)	2 => complex floats (4

diff --git a/gmtsar/csh/align_batch.csh b/gmtsar/csh/align_batch.csh
@@ -1,4 +1,4 @@
-#!/bin/tcsh -f
+#!/bin/csh -f
 #       $Id$
 
 # Align RAW or SLC images using orbits and DEM

diff --git a/gmtsar/csh/align_tops.csh b/gmtsar/csh/align_tops.csh
@@ -94,6 +94,7 @@ if ($skip_master == 2) then
   calc_dop_orb $mpre".PRM" tmp 0 0
   cat tmp >> $mpre".PRM"
   rm tmp
+  #update_PRM $mpre".PRM" input_file $mpre".raw"
 else 
   if ($skip_master == 0) then  
     make_s1a_tops $mxml $mtiff $mpre 0 
@@ -242,11 +243,13 @@ else
     calc_dop_orb $mpre".PRM" tmp 0 0
     cat tmp >> $mpre".PRM"
     rm tmp
+    #update_PRM $mpre".PRM" input_file $mpre".raw"
   endif
   set earth_radius = `grep earth_radius $mpre".PRM" | awk '{print $3}'`
   calc_dop_orb $spre".PRM" tmp2 $earth_radius 0
   cat tmp2 >> $spre".PRM"
   rm tmp2
+  #update_PRM $spre".PRM" input_file $spre".raw"
   #
   rm topo.llt master.ratll aligned.ratll *tmp* flt.grd r.xyz a.xyz *.PRM0
 endif
diff --git a/gmtsar/csh/align_tops_esd.csh b/gmtsar/csh/align_tops_esd.csh
@@ -101,6 +101,7 @@ if ($skip_master == 2) then
   calc_dop_orb $mpre".PRM" tmp 0 0 
   cat tmp >> $mpre".PRM"
   rm tmp 
+  #update_PRM $mpre".PRM" input_file $mpre".raw"
 else  
   if ($skip_master == 0) then  
     make_s1a_tops $mxml $mtiff $mpre 0 
@@ -284,12 +285,15 @@ else
     ext_orb_s1a $mpre".PRM" $2 $mpre
     calc_dop_orb $mpre".PRM" tmp 0 0
     cat tmp >> $mpre".PRM"
+    rm tmp
+    #update_PRM $mpre".PRM" input_file $mpre".raw"
   endif
   ext_orb_s1a $spre".PRM" $4 $spre
   set earth_radius = `grep earth_radius $mpre".PRM" | awk '{print $3}'`
   calc_dop_orb $spre".PRM" tmp2 $earth_radius 0
   cat tmp2 >> $spre".PRM"
   rm tmp2
+  #update_PRM $spre".PRM" input_file $spre".raw"
   #
   rm topo.llt master.ratll aligned.ratll *tmp* flt.grd r.xyz a.xyz *.PRM0 *SLCH *SLCL
 endif