Merge remote-tracking branch 'upstream/main' into main

.cmake/isce2_buildflags.cmake

@@ -31,3 +31,19 @@ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES ${abs_libdir} isSystemDir)
 if("${isSystemDir}" STREQUAL "-1")
     list(APPEND CMAKE_INSTALL_RPATH ${abs_libdir})
 endif()
+
+option(ISCE2_STRICT_COMPILATION "Enable strict checks during compilation" ON)
+if(ISCE2_STRICT_COMPILATION)
+
+    # Set -fno-common when supported to catch ODR violations
+    include(CheckCCompilerFlag)
+    check_c_compiler_flag(-fno-common C_FNO_COMMON)
+    if(C_FNO_COMMON)
+        add_compile_options($<$<COMPILE_LANGUAGE:C>:-fno-common>)
+    endif()
+    include(CheckCXXCompilerFlag)
+    check_cxx_compiler_flag(-fno-common CXX_FNO_COMMON)
+    if(CXX_FNO_COMMON)
+        add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-fno-common>)
+    endif()
+endif()

components/isceobj/Alos2burstProc/runCoregSd.py

@@ -183,7 +183,7 @@ def spectralDiversity(referenceSwath, interferogramDir, interferogramPrefix, out
     #get spectral diversity inteferogram
     offset_sd=[]
     for i in range(1, nls):
-        print('ouput spectral diversity inteferogram %d' % i)
+        print('output spectral diversity inteferogram %d' % i)
         #original spectral diversity inteferogram
         sd = inf[:,:,0] * np.conj(inf[:,:,i])
 

components/isceobj/IsceProc/runCrossmul.py

@@ -76,7 +76,7 @@ def run(imageSlc1, imageSlc2, resampName, azLooks, rgLooks, lines, catalog=None,
     slcWidth = imageSlc1.getWidth()
     intWidth = int(slcWidth / rgLooks)
 
-    logger.info("Will ouput interferogram and amplitude: %s" % sceneid)
+    logger.info("Will output interferogram and amplitude: %s" % sceneid)
     resampAmp = resampName + '.amp'
     resampInt = resampName + '.int'
 

components/isceobj/IsceProc/runResamp.py

@@ -106,7 +106,7 @@ def run(imageSlc1, imageSlc2, instrument, offsetField, resampName, azLooks, rgLo
         imageResamp2 = None
 
     if "intamp" in output:
-        logger.info("Will ouput resampled interferogram and amplitude: %s" % sceneid)
+        logger.info("Will output resampled interferogram and amplitude: %s" % sceneid)
         resampAmp = resampName + '.amp'
         resampInt = resampName + '.int'
 

components/isceobj/Orbit/CMakeLists.txt

@@ -7,6 +7,7 @@ target_include_directories(orbitHermite PUBLIC include)
 InstallSameDir(
     orbitHermite
     __init__.py
+    Inertial.py
     ODR.py
     Orbit.py
     OrbitExtender.py

components/isceobj/Sensor/CMakeLists.txt

@@ -67,7 +67,7 @@ Python_add_library(alos MODULE
     src/ALOS_pre_process/data_ALOS.h
     src/ALOS_pre_process/data_ALOSE.h
     src/ALOS_pre_process/hermite_c.c
-    src/ALOS_pre_process/image_sio.h
+    src/ALOS_pre_process/image_sio.c
     src/ALOS_pre_process/init_from_PRM.c
     src/ALOS_pre_process/interpolate_ALOS_orbit.c
     src/ALOS_pre_process/null_sio_struct.c

components/isceobj/Sensor/GRD/Sentinel1.py

@@ -721,13 +721,17 @@ class Sentinel1(Component):
                 block_azimuth_end = int(child.find('lastAzimuthLine').text)
                 block_line_index = [float(x) for x in linenode.text.split()]
                 block_vector = [float(x) for x in signode.text.split()]
-
                 block_line_range = np.arange(block_azimuth_start, block_azimuth_end + 1)
-                block_vector_interpolator = InterpolatedUnivariateSpline(block_line_index, block_vector, k=1)
 
-                for line in block_line_range:
+                if len(block_vector) > 1:
-                    noise_azimuth_lut_indices[line].extend([block_range_start, block_range_end])
+                    block_vector_interpolator = InterpolatedUnivariateSpline(block_line_index, block_vector, k=1)
-                    noise_azimuth_lut_values[line].extend([block_vector_interpolator(line)] * 2)
+                    for line in block_line_range:
+                        noise_azimuth_lut_indices[line].extend([block_range_start, block_range_end])
+                        noise_azimuth_lut_values[line].extend([block_vector_interpolator(line)] * 2)
+                else:
+                    for line in block_line_range:
+                        noise_azimuth_lut_indices[line].extend([block_range_start, block_range_end])
+                        noise_azimuth_lut_values[line].extend([block_vector[0]] * 2)
 
             self.noiseAzimuthLUT = (noise_azimuth_lut_indices, noise_azimuth_lut_values)
 

components/isceobj/Sensor/src/ALOS_pre_process/SConscript

@@ -13,7 +13,8 @@ sourceFiles = ['ALOSE_orbits_utils.c','ALOS_ldr_orbit.c','ALOS_pre_process.c','c
                'swap_ALOS_data_info.c','utils.c','write_ALOS_prm.c',
                'readOrbitPulse.f','readOrbitPulseState.f',
                'readOrbitPulseSetState.f','image_sio.c',
-               'lib_array.c', 'lib_cpx.c', 'lib_file.c', 
+               ]
+sourceFiles += ['lib_array.c', 'lib_cpx.c', 'lib_file.c', 
                'lib_func.c', 'resamp_azimuth.c']
 lib = envSensorSrc1.Library(target = 'alos', source = sourceFiles)
 envSensorSrc1.Install(install,lib)

components/isceobj/Sensor/src/ALOS_pre_process/image_sio.c

@@ -0,0 +1,16 @@
+#include "image_sio.h"
+
+int verbose;
+int debug;
+int roi;
+int swap;
+int quad_pol;
+int ALOS_format;
+
+int force_slope;
+int dopp;
+int quiet_flag;
+int SAR_mode;
+
+double forced_slope;
+double  tbias;

components/isceobj/Sensor/src/ALOS_pre_process/image_sio.h

@@ -160,19 +160,19 @@ radar_wavelength	lambda
 rng_spec_wgt		rhww
 
 */
-int	verbose;	/* controls minimal level of output 	*/ 
+extern int    verbose;      /* controls minimal level of output     */
-int	debug; 		/* more output 				*/
+extern int    debug;        /* more output                          */
-int	roi; 		/* more output 				*/
+extern int    roi;          /* more output                          */
-int	swap; 		/* whether to swap bytes 		*/
+extern int    swap;         /* whether to swap bytes                */
-int	quad_pol; 	/* quad polarization data 		*/
+extern int    quad_pol;     /* quad polarization data               */
-int	ALOS_format; 	/* AUIG:  ALOS_format = 0  		*/
+extern int    ALOS_format;  /* AUIG:  ALOS_format = 0               */
-			/* ERSDAC:  ALOS_format = 1  		*/
+                            /* ERSDAC:  ALOS_format = 1             */
-int	force_slope;	/* whether to set the slope	 	*/
+extern int    force_slope;  /* whether to set the slope             */
-int	dopp;		/* whether to calculate doppler 	*/
+extern int    dopp;         /* whether to calculate doppler         */
-int	quiet_flag;	/* reduce output			*/
+extern int    quiet_flag;   /* reduce output                        */
-int	SAR_mode;	/* 0 => high-res 			*/	
+extern int    SAR_mode;     /* 0 => high-res                        */
-			/* 1 => wide obs 			*/
+                            /* 1 => wide obs                        */
-			/* 2 => polarimetry 			*/
+                            /* 2 => polarimetry                     */
-			/* from ALOS Product Format 3-2		*/
+                            /* from ALOS Product Format 3-2         */
-double	forced_slope;	/* value to set chirp_slope to          */
+extern double forced_slope; /* value to set chirp_slope to          */
-double  tbias;          /* time bias for bad orbit data         */
+extern double tbias;        /* time bias for bad orbit data         */

components/isceobj/Sensor/src/ALOS_pre_process/read_ALOSE_data.c

@@ -67,9 +67,9 @@ int fill_shift_data(int, int, int, int, int, char *, char *, FILE *);
 int handle_prf_change_ALOSE(struct PRM *, FILE *, long *, int); 
 void change_dynamic_range(char *data, long length);
 
-struct 	sardata_record r1;
+static struct sardata_record r1;
-struct	sardata_descriptor_ALOSE dfd;
+static struct sardata_descriptor_ALOSE dfd;
-struct	sardata_info_ALOSE sdr;
+static struct sardata_info_ALOSE sdr;
 
 /*
 differences in include file from ALOS AUIG 

components/isceobj/Sensor/src/ALOS_pre_process/read_ALOS_data.c

@@ -69,9 +69,9 @@ int fill_shift_data(int, int, int, int, int, char *, char *, FILE *);
 int handle_prf_change(struct PRM *, FILE *, long *, int); 
 void change_dynamic_range(char *data, long length);
 
-struct 	sardata_record r1;
+static struct sardata_record r1;
-struct	sardata_descriptor dfd;
+static struct sardata_descriptor dfd;
-struct	sardata_info sdr;
+static struct sardata_info sdr;
 
 long read_ALOS_data (FILE *imagefile, FILE *outfile, struct PRM *prm, long *byte_offset, struct resamp_info *rspi, int nPRF) {
 

components/stdproc/alosreformat/ALOS_lib/src/image_sio.c

@@ -0,0 +1,16 @@
+#include "image_sio.h"
+
+int verbose;
+int debug;
+int roi;
+int swap;
+int quad_pol;
+int ALOS_format;
+
+int force_slope;
+int dopp;
+int quiet_flag;
+int SAR_mode;
+
+double forced_slope;
+double tbias;

components/stdproc/alosreformat/CMakeLists.txt

@@ -1,6 +1,7 @@
 isce2_add_staticlib(alosLib
     ALOS_lib/src/cfft1d.c
     ALOS_lib/src/find_fft_length.c
+    ALOS_lib/src/image_sio.c
     ALOS_lib/src/utils.c
     ALOS_lib/src/ALOS_ldr_orbit.c
     ALOS_lib/src/calc_dop.c

components/stdproc/alosreformat/include/image_sio.h

@@ -146,19 +146,19 @@ radar_wavelength	lambda
 rng_spec_wgt		rhww
 
 */
-int	verbose;	/* controls minimal level of output 	*/ 
+extern int verbose;         /* controls minimal level of output */
-int	debug; 		/* more output 				*/
+extern int debug;           /* more output                      */
-int	roi; 		/* more output 				*/
+extern int roi;             /* more output                      */
-int	swap; 		/* whether to swap bytes 		*/
+extern int swap;            /* whether to swap bytes            */
-int	quad_pol; 	/* quad polarization data 		*/
+extern int quad_pol;        /* quad polarization data           */
-int	ALOS_format; 	/* AUIG:  ALOS_format = 0  		*/
+extern int ALOS_format;     /* AUIG:  ALOS_format = 0           */
-			/* ERSDAC:  ALOS_format = 1  		*/
+                            /* ERSDAC:  ALOS_format = 1         */
-int	force_slope;	/* whether to set the slope	 	*/
+extern int force_slope;     /* whether to set the slope         */
-int	dopp;		/* whether to calculate doppler 	*/
+extern int dopp;            /* whether to calculate doppler     */
-int	quiet_flag;	/* reduce output			*/
+extern int quiet_flag;      /* reduce output                    */
-int	SAR_mode;	/* 0 => high-res 			*/	
+extern int SAR_mode;        /* 0 => high-res                    */
-			/* 1 => wide obs 			*/
+                            /* 1 => wide obs                    */
-			/* 2 => polarimetry 			*/
+                            /* 2 => polarimetry                 */
-			/* from ALOS Product Format 3-2		*/
+                            /* from ALOS Product Format 3-2     */
-double	forced_slope;	/* value to set chirp_slope to          */
+extern double forced_slope; /* value to set chirp_slope to      */
-double  tbias;          /* time bias for bad orbit data         */
+extern double tbias;        /* time bias for bad orbit data     */

release_history.py

@@ -54,7 +54,15 @@ releases = (Tag('1.0.0',   '739', '20120814'),
             Tag('2.1.0',  '2366', '20170806'),
             Tag('2.2.0',  '2497', '20180714'),
             Tag('2.2.1',  '2517', '20181221'),
-            Tag('2.3',    '2531', '20190112'))
+            Tag('2.3',    '2531', '20190112'),
+            # git migration
+            Tag('2.3.1', '', '20190220'),
+            Tag('2.3.2', '', '20190618'),
+            Tag('2.3.3', '', '20200402'),
+            Tag('2.4.0', '', '20200730'),
+            Tag('2.4.1', '', '20200915'),
+            Tag('2.4.2', '', '20201116'),
+)
 
 
 release_version = releases[-1].version