From dc1a16a4c64ba6bc0c072c5c634e2c19bedce798 Mon Sep 17 00:00:00 2001 From: Eric Fielding Date: Sun, 21 May 2023 19:35:16 -0700 Subject: [PATCH 1/3] minor update alosStack_tutorial --- contrib/stack/alosStack/alosStack_tutorial.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/contrib/stack/alosStack/alosStack_tutorial.txt b/contrib/stack/alosStack/alosStack_tutorial.txt index 1c001388..f8cd9426 100755 --- a/contrib/stack/alosStack/alosStack_tutorial.txt +++ b/contrib/stack/alosStack/alosStack_tutorial.txt @@ -1,6 +1,7 @@ ###################################################################################### # Tutorial for alosStack # Cunren Liang, October 2020 +# updated Eric Fielding, May 2023 ###################################################################################### This is the tutorial of alosStack processor. @@ -11,10 +12,10 @@ This is the tutorial of alosStack processor. ########################################### Set environment variable 'ISCE_STACK' -export ISCE_STACK=CODE_DIR/contrib/stack +export ISCE_STACK=CODE_DIR/isce2/contrib/stack/ -where CODE_DIR is the directory of your isce code. Note that alosStack is not installed when you install -the software, so CODE_DIR is your code directory rather than installation directory. +where CODE_DIR is the directory of your isce code. The alosStack is not installed in your ISCE_HOME directory when you install +the software, so CODE_DIR is your ISCE2 source code directory rather than installation directory. ########################################### From b20f9b830c95b63f93c9464ea9511f33ddff81c2 Mon Sep 17 00:00:00 2001 From: Eric Fielding Date: Sat, 3 Feb 2024 00:26:42 -0800 Subject: [PATCH 2/3] added char type in ALOS modules --- .../alosreformat/ALOS_fbd2fbs/bindings/ALOS_fbd2fbsmodule.c | 2 +- .../alosreformat/ALOS_fbs2fbd/bindings/ALOS_fbs2fbdmodule.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/components/stdproc/alosreformat/ALOS_fbd2fbs/bindings/ALOS_fbd2fbsmodule.c b/components/stdproc/alosreformat/ALOS_fbd2fbs/bindings/ALOS_fbd2fbsmodule.c index 31268e21..f3d00144 100644 --- a/components/stdproc/alosreformat/ALOS_fbd2fbs/bindings/ALOS_fbd2fbsmodule.c +++ b/components/stdproc/alosreformat/ALOS_fbd2fbs/bindings/ALOS_fbd2fbsmodule.c @@ -34,7 +34,7 @@ #include "ALOS_fbd2fbsmodule.h" -const* __doc__ = "Python extension for ALOS_fbd2fbs.c"; +const char* __doc__ = "Python extension for ALOS_fbd2fbs.c"; static struct PyModuleDef moduledef = { // header diff --git a/components/stdproc/alosreformat/ALOS_fbs2fbd/bindings/ALOS_fbs2fbdmodule.c b/components/stdproc/alosreformat/ALOS_fbs2fbd/bindings/ALOS_fbs2fbdmodule.c index 6f97d2c1..66c65529 100644 --- a/components/stdproc/alosreformat/ALOS_fbs2fbd/bindings/ALOS_fbs2fbdmodule.c +++ b/components/stdproc/alosreformat/ALOS_fbs2fbd/bindings/ALOS_fbs2fbdmodule.c @@ -34,7 +34,7 @@ #include "ALOS_fbs2fbdmodule.h" -const* __doc__ = "Python extension for ALOS_fbs2fbd.c"; +const char* __doc__ = "Python extension for ALOS_fbs2fbd.c"; static struct PyModuleDef moduledef = { // header From 3a12354fa45346193ded88829ce96e8dd76ba2a8 Mon Sep 17 00:00:00 2001 From: Eric Fielding Date: Mon, 2 Sep 2024 09:23:41 -0700 Subject: [PATCH 3/3] Updated snaphu and psfilt1 for new gcc --- .gitignore | 1 + contrib/Snaphu/src/snaphu_util.c | 4 ++-- contrib/alos2filter/src/psfilt1.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index a9a21d17..c5182460 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ config.log insar.log isce.log .ipynb_checkpoints +build \ No newline at end of file diff --git a/contrib/Snaphu/src/snaphu_util.c b/contrib/Snaphu/src/snaphu_util.c index bb1422d7..93e82fa2 100644 --- a/contrib/Snaphu/src/snaphu_util.c +++ b/contrib/Snaphu/src/snaphu_util.c @@ -575,8 +575,8 @@ signed char ValidDataArray(float **arr, long nrow, long ncol){ */ signed char IsFinite(double d){ - return(finite(d)); - /* return(isfinite(d)); */ + /* not available on arm64 return(finite(d)); */ + return(isfinite(d)); /* return(!(isnan(d) || isinf(d))); */ /* return(TRUE) */ } diff --git a/contrib/alos2filter/src/psfilt1.c b/contrib/alos2filter/src/psfilt1.c index 3051f1fa..4f3e8a78 100644 --- a/contrib/alos2filter/src/psfilt1.c +++ b/contrib/alos2filter/src/psfilt1.c @@ -522,8 +522,8 @@ void stop_timing() */ signed char IsFinite(double d){ - return(finite(d)); - /* return(isfinite(d)); */ + /* not available on arm64 return(finite(d)); */ + return(isfinite(d)); /* return(!(isnan(d) || isinf(d))); */ /* return(TRUE) */ }