From 005fc7b3b4176080de77e73ef069febc1c9e9d11 Mon Sep 17 00:00:00 2001 From: fabricebrito Date: Wed, 22 Apr 2015 10:01:08 +0200 Subject: [PATCH 1/3] update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index deb2b80..f16d57c 100644 --- a/README.md +++ b/README.md @@ -54,8 +54,8 @@ Log on the developer sandbox and run these commands in a shell: ```bash cd git clone git@github.com:geohazards-tep/InSAR-ROI_PAC.git -git checkout develop cd InSAR-ROI_PAC +git checkout develop mvn install ``` From c52d4445b45315eba512b871777d19274062e8d6 Mon Sep 17 00:00:00 2001 From: fabricebrito Date: Wed, 22 Apr 2015 14:56:02 +0200 Subject: [PATCH 2/3] fixed geocoding --- src/main/app-resources/roipac/run.sh | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/main/app-resources/roipac/run.sh b/src/main/app-resources/roipac/run.sh index 1db1546..26294dc 100755 --- a/src/main/app-resources/roipac/run.sh +++ b/src/main/app-resources/roipac/run.sh @@ -1,5 +1,5 @@ #!/bin/bash - + # source the ciop functions (e.g. ciop-log) source ${ciop_job_include} @@ -32,7 +32,7 @@ function cleanExit () trap cleanExit EXIT -# create a shorter TMPDIR name for some ROI_PAC scripts/binaires +# create a shorter TMPDIR name for some ROI_PAC scripts/binaires UUIDTMP="/tmp/`uuidgen`" #ln -s $TMPDIR $UUIDTMP mkdir ${UUIDTMP} @@ -53,7 +53,7 @@ cat > $TMPDIR/input # retrieve the aux files mkdir -p $TMPDIR/aux -for input in `cat $TMPDIR/input | grep 'aux='` +for input in `cat $TMPDIR/input | grep 'aux='` do ciop-log "DEBUG" "retrieving aux file ${input#aux=}" echo ${input#aux=} | ciop-copy -O $TMPDIR/aux - 2> /dev/null @@ -62,7 +62,7 @@ done # retrieve the orbit data mkdir -p $TMPDIR/vor -for input in `cat $TMPDIR/input | grep 'vor='` +for input in `cat $TMPDIR/input | grep 'vor='` do ciop-log "DEBUG" "retrieving orbit file ${input#aux=}" echo ${input#vor=} | ciop-copy -O $TMPDIR/vor - 2> /dev/null @@ -78,7 +78,7 @@ ciop-log "DEBUG" "dem wps results is ${wps_result}" # extract the result URL curl -L -o $TMPDIR/workdir/dem/dem.tgz "${wps_result}" 2> /dev/null -tar xzf $TMPDIR/workdir/dem/dem.tgz -C $TMPDIR/workdir/dem/ +tar xzf $TMPDIR/workdir/dem/dem.tgz -C $TMPDIR/workdir/dem/ dem="`find $TMPDIR/workdir/dem -name "*.dem"`" @@ -94,7 +94,7 @@ do # get the date in format YYMMDD sar_date=`opensearch-client $sar_url startdate | cut -c 3-10 | tr -d "-"` sar_date_short=`echo $sar_date | cut -c 1-4` - + ciop-log "DEBUG" "SAR input ${sar_url}" ciop-log "INFO" "SAR date: $sar_date and $sar_date_short" @@ -104,7 +104,7 @@ do sar_folder=$TMPDIR/workdir/$sar_date mkdir -p $sar_folder - + # get ASAR products sar_url=`opensearch-client $sar_url enclosure` sar="`ciop-copy -o $sar_folder $sar_url`" @@ -126,7 +126,7 @@ do base=${sar1}_${sar2} geodir=${geodir}-${sar_date_short} fi -done +done ciop-log "INFO" "Conversion of SAR pair to RAW completed" @@ -177,7 +177,10 @@ process_2pass.pl $roipac_proc 1>&2 cd int_${intdir} ciop-log "INFO" "Geocoding the wrapped interferogram" -cpx2rmg filt_${intdir}-sim_HDR_4rlks.int filt_${intdir}-sim_HDR_4rlks.int.hgt +h=$(cat filt_${intdir}-sim_HDR_4rlks.int | grep FILE_LENGTH | tr -s " " | cut -d " " -f 2) +w=$(cat filt_${intdir}-sim_HDR_4rlks.int | grep WIDTH | tr -s " " | cut -d " " -f 2) +cpx2rmg filt_${intdir}-sim_HDR_4rlks.int filt_${intdir}-sim_HDR_4rlks.int.hgt ${w} ${h} +cp filt_${intdir}-sim_HDR_4rlks.int.rsc filt_${intdir}-sim_HDR_4rlks.int.hgt.rsc geocode.pl geomap_4rlks.trans filt_${intdir}-sim_HDR_4rlks.int.hgt geo_${intdir}.int ciop-log "INFO" "Creating geotif files for interferogram phase and magnitude" From 3172e8d962d75eef222ae173a8e1ced5c6ea8d72 Mon Sep 17 00:00:00 2001 From: Francesco Barchetta Date: Thu, 23 Apr 2015 10:58:58 +0100 Subject: [PATCH 3/3] v1.3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 432b650..7127ec0 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ rpm InSAR-ROI_PAC InSAR-ROI_PAC - 1.3-SNAPSHOT + 1.3 scm:git:git@github.com:Terradue/InSAR-ROI_PAC.git