Routine update and bug fixes

PrideLab · Sep 28, 2023 · ae88705 · ae88705
1 parent 646bf51
commit ae88705
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -92,9 +92,9 @@
  - lib: fixed the issue of unable to read zero biases from bias product
  - table: added igs20_2247.atx
 
- 18. 2023-09-08 (v2.2.6)
+ 18. 2023-09-28 (v2.2.6)
  - pdp3.sh: consider specifying the language/region setting to "en_US.UTF-8" to avoid issues with decimal comma
- - pdp3.sh: fixed the issue of unable to download GIM products for 2nd ionospheric corrections after 2022/300
+ - pdp3.sh: fixed the issue of unable to download GIM products for 2nd ionospheric corrections after 2022/330
  - pdp3.sh: fixed the issue of unable to recognize some RINEX observation files
  - lib: fixed the issue of reading multi-day quaternions
  - lib: improved the substitution rules for vacant multi-GNSS PCOs/PCVs and fixed related read issues

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 ![pridelab.icon](https://github.com/PrideLab/PRIDE-PPPAR/blob/master/doc/PRIDE.png)
-## PRIDE-PPPAR ver. 2.2.6 (last updated on 2023-09-08)
+## PRIDE-PPPAR ver. 2.2.6 (last updated on 2023-09-28)
 
 PRIDE PPP-AR ver. 2.2 originates in Dr. Maorong Ge’s efforts on PPP-AR and later developed and improved by Dr. Jianghui Geng's team. It is an open-source software package which is based on many GNSS professionals’ collective work in GNSS Research Center, Wuhan University. We would like to thank them all for their brilliant contributions to this software. 
 
@@ -176,11 +176,11 @@ Release of PRIDE PPP-AR v2.2
 * lib: fixed the issue of unable to read zero biases from bias product
 * table: added igs20\_2247.atx
 
-2023-09-08 (v2.2.6)
+2023-09-28 (v2.2.6)
 
 * pdp3.sh: consider specifying the language/region setting to "en_US.UTF-8" to avoid issues with decimal comma
     - please contact us if further issues persist in your region
-* pdp3.sh: fixed the issue of unable to download GIM products for 2nd ionospheric corrections after 2022/300
+* pdp3.sh: fixed the issue of unable to download GIM products for 2nd ionospheric corrections after 2022/330
 * pdp3.sh: fixed the issue of unable to recognize some RINEX observation files
 * lib: fixed the issue of reading multi-day quaternions
 * lib: improved the substitution rules for vacant multi-GNSS PCOs/PCVs and fixed related read issues

diff --git a/scripts/pdp3.sh b/scripts/pdp3.sh
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ##  VERSION: ver 2.2                                                         ##
 ##                                                                           ##
-##  DATE   : Sept-08, 2023                                                   ##
+##  DATE   : Sept-28, 2023                                                   ##
 ##                                                                           ##
 ##              @ GNSS RESEARCH CENTER, WUHAN UNIVERSITY, 2023               ##
 ##                                                                           ##
@@ -1990,7 +1990,7 @@ PrepareProducts() { # purpose : prepare PRIDE-PPPAR needed products in working d
         echo -e "$MSGINF Prepare IGS ANTEX product: $abs_atx ..."
     else
         [[ "$OFFLINE" == "NO" ]] && abs_atx=$(curl https://files.igs.org/pub/station/general/ | grep -Eo "igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
-        [[ $? -eq 0 ]] || abs_atx=$(ls "$table_dir/igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
+        [ -n "$abs_atx" ] || abs_atx=$(ls "$table_dir" | grep -Eo "igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
         echo -e "$MSGINF Prepare IGS ANTEX product: $abs_atx ..."
         echo -e "$MSGWAR no PCO/PCV model specified in clock product $clk, use default instead"
     fi
@@ -2079,7 +2079,7 @@ PrepareProducts() { # purpose : prepare PRIDE-PPPAR needed products in working d
         [ "$OFFLINE" == "NO" ] && mkdir -p "$product_ion_dir"
         for mjd in $(seq $mjd_s $mjd_e); do
             local ydoy=($(mjd2ydoy $mjd))
-            if [ $mjd -le 59879 ]; then
+            if [ $mjd -le 59909 ]; then
                 local ion_tmp="CODG${ydoy[1]}0.${ydoy[0]:2:2}I"
                 local ion_cmp="${ion_tmp}.Z"
             else

diff --git a/scripts/pdp3_Mac.sh b/scripts/pdp3_Mac.sh
@@ -8,7 +8,7 @@
 ##                                                                           ##
 ##  VERSION: ver 2.2                                                         ##
 ##                                                                           ##
-##  DATE   : Sept-08, 2023                                                   ##
+##  DATE   : Sept-28, 2023                                                   ##
 ##                                                                           ##
 ##              @ GNSS RESEARCH CENTER, WUHAN UNIVERSITY, 2023               ##
 ##                                                                           ##
@@ -1990,7 +1990,7 @@ PrepareProducts() { # purpose : prepare PRIDE-PPPAR needed products in working d
         echo -e "$MSGINF Prepare IGS ANTEX product: $abs_atx ..."
     else
         [[ "$OFFLINE" == "NO" ]] && abs_atx=$(curl https://files.igs.org/pub/station/general/ | grep -Eo "igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
-        [[ $? -eq 0 ]] || abs_atx=$(ls "$table_dir/igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
+        [ -n "$abs_atx" ] || abs_atx=$(ls "$table_dir" | grep -Eo "igs[0-9]{2}_[0-9]{4}.atx" | tail -1)
         echo -e "$MSGINF Prepare IGS ANTEX product: $abs_atx ..."
         echo -e "$MSGWAR no PCO/PCV model specified in clock product $clk, use default instead"
     fi
@@ -2079,7 +2079,7 @@ PrepareProducts() { # purpose : prepare PRIDE-PPPAR needed products in working d
         [ "$OFFLINE" == "NO" ] && mkdir -p "$product_ion_dir"
         for mjd in $(seq $mjd_s $mjd_e); do
             local ydoy=($(mjd2ydoy $mjd))
-            if [ $mjd -le 59879 ]; then
+            if [ $mjd -le 59909 ]; then
                 local ion_tmp="CODG${ydoy[1]}0.${ydoy[0]:2:2}I"
                 local ion_cmp="${ion_tmp}.Z"
             else