V2.07

ChangChuntao · Feb 10, 2023 · 08cb653 · 08cb653
1 parent 9876962
commit 08cb653
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 20 deletions.
diff --git a/FAST_src/CDD_Sub.py b/FAST_src/CDD_Sub.py
@@ -5,7 +5,7 @@
 # Copyright(C)   : The GNSS Center, Wuhan University & Chinese Academy of Surveying and mapping
 # Latest Version : 2.07
 # Creation Date  : 2022.03.27 - Version 1.00
-# Date           : 2023-01-14 - Version 2.07
+# Date           : 2023-02-10 - Version 2.07
 from Format import *
 from help import *
 from Dowload import *
@@ -152,7 +152,9 @@ def sub_cdd(obj):
                     > MGEX_GFZ_F_sp3 -> GRE_GFZ_F_sp3 / MGEX_GFZ_F_clk -> GRE_GFZ_F_clk
                     by Chang Chuntao  -> Version : 2.06
     2023-02-02 :    > P1C1 重复
+                    > 修正clk数字
                     + COD_F_erp
+                    + IGS_crd_snx / COD_sol_snx / ESA_sol_snx / GFZ_sol_snx / GRG_sol_snx / NGS_sol_snx / SIO_sol_snx
                     by Chang Chuntao  -> Version : 2.07
     """
     print("")
@@ -194,10 +196,10 @@ def sub_cdd(obj):
         print("    |                                                                            |")
         print("    +------------------------------------GCRE------------------------------------+")
         print("    |                                                                            |")
-        print("    |    6 : MGEX_WHU_F_clk         7 : MGEX_WHU_R_clk         8 : MGEX_WHU_U_clk|")
-        print("    |    9 : MGEX_WHU_Hour_clk     10 : MGEX_SHA_F_clk        11 : MGEX_COD_F_clk|")
-        print("    |   12 : MGEX_GRG_F_clk        14 : MGEX_GFZ_R_clk        13 : GRE_GFZ_F_clk |")
-        print("    |   14 : GRE_COD_R_clk         15 : GLO_IGL_F_clk                            |")
+        print("    |    5 : MGEX_WHU_F_clk         6 : MGEX_WHU_R_clk         7 : MGEX_WHU_U_clk|")
+        print("    |    8 : MGEX_WHU_Hour_clk      9 : MGEX_SHA_F_clk        10 : MGEX_COD_F_clk|")
+        print("    |   11 : MGEX_GRG_F_clk        13 : MGEX_GFZ_R_clk        14 : GRE_GFZ_F_clk |")
+        print("    |   15 : GRE_COD_R_clk         16 : GLO_IGL_F_clk                            |")
         print("    |                                                                            |")
         print("    +----------------------------------------------------------------------------+")
     elif obj == 4:
@@ -265,6 +267,9 @@ def sub_cdd(obj):
         print("    |                                                                            |")
         print("    |    1 : IGS_day_snx            2 : IGS_week_snx           3 : IVS_week_snx  |")
         print("    |    4 : ILS_week_snx           5 : IDS_week_snx                             |")
+        print("    |    6 : IGS_crd_snx            7 : COD_sol_snx            8 : ESA_sol_snx   |")
+        print("    |    9 : GFZ_sol_snx           10 : GRG_sol_snx           11 : NGS_sol_snx   |")
+        print("    |   12 : SIO_sol_snx                                                         |")
         print("    |                                                                            |")
         print("    +----------------------------------------------------------------------------+")
     elif obj == 9:

diff --git a/FAST_src/FAST-QT.py b/FAST_src/FAST-QT.py
@@ -16,14 +16,15 @@
 from GNSS_TYPE import gnss_type, yd_type, ym_type, no_type, yds_type, s_type
 import qdarkstyle
 
-version = [2.00, 2.01, 2.02, 2.03, 2.04, 2.05, 2.06]
+version = [2.00, 2.01, 2.02, 2.03, 2.04, 2.05, 2.06, 2.07]
 version_time = ['2022-11-08',
                 '2022-11-09',
                 '2022-11-10',
                 '2022-11-15',
                 '2022-12-02',
                 '2022-12-04',
-                '2023-01-14']
+                '2023-01-14',
+                '2023-02-10']
 
 if getattr(sys, 'frozen', False):
     dirname = os.path.dirname(sys.executable)

diff --git a/FAST_src/FTP_Source.py b/FAST_src/FTP_Source.py
@@ -5,7 +5,7 @@
 # Copyright(C)   : The GNSS Center, Wuhan University & Chinese Academy of Surveying and mapping
 # Latest Version : 2.07
 # Creation Date  : 2022.03.27 - Version 1.00
-# Date           : 2023-01-14 - Version 2.07
+# Date           : 2023-02-10 - Version 2.07
 import datetime
 
 nowTime = datetime.datetime.utcnow()
@@ -103,9 +103,12 @@
                     > IGS rename -> GPS_IGS_sp3 / GPS_IGR_sp3 / GPS_IGU_sp3 / GRE_COD_R_sp3 / GPS_IGS_clk
                     >               GPS_IGR_clk / GPS_IGS_clk_30s / GRE_COD_R_clk / IGS_erp
                     by Chang Chuntao  -> Version : 2.06
-    2023-01-24 :    > GPS_EU_CORS -> MGEX_EU_cors
-                    + MGEX_EU_cors add source
-                    by Chang Chuntao  -> Version : 2.06
+    2023-02-10 :    > GPS_EU_CORS -> MGEX_EU_cors
+                    > MGEX_EU_cors / CODG_ion  add source
+                    > IGS rename -> IGS_day_snx / IGS_week_snx
+                    + COD_F_erp
+                    + IGS_crd_snx / COD_sol_snx / ESA_sol_snx / GFZ_sol_snx / GRG_sol_snx / NGS_sol_snx / SIO_sol_snx
+                    by Chang Chuntao  -> Version : 2.07
 '''
 
 FTP_S = {"GPS_brdc": ["ftp://igs.gnsswhu.cn//pub/gps/data/daily/<YEAR>/<DOY>/<YY>n/brdc<DOY>0.<YY>n.Z",
@@ -288,8 +291,9 @@
                            "ftps://gdc.cddis.eosdis.nasa.gov/gnss/data/highrate/<YYYY>/<DOY>/"
                            "<SITE_LONG>_R_<YYYY><DOY>0000_01D_01S_MO.crx.tar"],
 
-         "MGEX_EU_cors": ["https://gnss.bev.gv.at/at.gv.bev.dc/data/obs/<YYYY>/<DOY>/<SITE_LONG>_S_<YYYY><DOY>0000_01D_30S_MO.crx.gz",
-                          "https://igs.bkg.bund.de/root_ftp/EUREF//obs/<YYYY>/<DOY>/<SITE_LONG>_S_<YYYY><DOY>0000_01D_30S_MO.crx.gz"],
+         "MGEX_EU_cors": [
+             "https://gnss.bev.gv.at/at.gv.bev.dc/data/obs/<YYYY>/<DOY>/<SITE_LONG>_S_<YYYY><DOY>0000_01D_30S_MO.crx.gz",
+             "https://igs.bkg.bund.de/root_ftp/EUREF//obs/<YYYY>/<DOY>/<SITE_LONG>_S_<YYYY><DOY>0000_01D_30S_MO.crx.gz"],
 
          "GPS_AU_cors": ["ftp://ftp.ga.gov.au/geodesy-outgoing/gnss/data/daily/<YYYY>/<YY><DOY>/<SITE><DOY>0.<YY>d.Z"],
 
@@ -528,7 +532,8 @@
                       "ftp://igs.ign.fr/pub/igs/products/ionosphere/<YYYY>/<DOY>/whrg<DOY>0.<YY>i.Z",
                       "ftp://igs.gnsswhu.cn/pub/gps/products/ionex/<YYYY>/<DOY>/whrg<DOY>0.<YY>i.Z"],
 
-         "CODG_ion": ["ftp://ftp.gipp.org.cn/product/ionex/<YYYY>/<DOY>/codg<DOY>0.<YY>i.Z",
+         "CODG_ion": ['http://ftp.aiub.unibe.ch/CODE/<YYYY>/COD0OPSFIN_<YYYY><DOY>0000_01D_01H_GIM.INX.gz',
+                      "ftp://ftp.gipp.org.cn/product/ionex/<YYYY>/<DOY>/codg<DOY>0.<YY>i.Z",
                       "--ftp-user anonymous --ftp-password [email protected] "
                       "ftps://gdc.cddis.eosdis.nasa.gov/gps/products/ionex/<YYYY>/<DOY>/codg<DOY>0.<YY>i.Z",
                       "ftp://gssc.esa.int/gnss/products/ionex/<YYYY>/<DOY>/codg<DOY>0.<YY>i.Z",
@@ -588,11 +593,12 @@
                       "ftp://igs.ign.fr/pub/igs/products/ionosphere/<YYYY>/<DOY>/esrg<DOY>0.<YY>i.Z",
                       "ftp://igs.gnsswhu.cn/pub/gps/products/ionex/<YYYY>/<DOY>/esrg<DOY>0.<YY>i.Z"],
 
-         "IGS_day_snx": ["ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/igs<YY>P<GPSWD>.snx.Z",
+         "IGS_day_snx": ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/IGS0OPSSNX_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         "ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/igs<YY>P<GPSWD>.snx.Z",
                          "--ftp-user anonymous --ftp-password [email protected] "
                          "ftps://gdc.cddis.eosdis.nasa.gov/gps/products/<GPSW>/igs<YY>P<GPSWD>.snx.Z"],
 
-         "IGS_week_snx": ["--ftp-user anonymous --ftp-password [email protected] "
+         "IGS_week_snx": ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/IGS0OPSSNX_<YYYY><DOY>0000_07D_07D_SOL.SNX.gz',
                           "ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/igs<YY>P<GPSW>.snx.Z",
                           "--ftp-user anonymous --ftp-password [email protected] "
                           "ftps://gdc.cddis.eosdis.nasa.gov/gps/products/<GPSW>/igs<YY>P<GPSW>.snx.Z"],
@@ -621,6 +627,27 @@
              "ftps://gdc.cddis.eosdis.nasa.gov/doris/products/sinex_series/idswd/ids<YY><DOY>wd19.snx.Z",
          ],
 
+         'IGS_crd_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/IGS0OPSSNX_<YYYY><DOY>0000_01D_01D_CRD.SNX.gz',
+                         "ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/igs<YY>P<GPSW>.ssc.Z"],
+
+         'COD_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/COD0OPSFIN_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/cod<GPSWD>.snx.Z'],
+
+         'ESA_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/ESA0OPSFIN_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/esa<GPSWD>.snx.Z'],
+
+         'GFZ_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/GFZ0OPSFIN_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/gfz<GPSWD>.snx.Z'],
+
+         'GRG_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/GRG0OPSFIN_<YYYY><DOY>0000_01D_000_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/grg<GPSWD>.snx.Z'],
+
+         'NGS_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/NGS0OPSFIN_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/ngs<GPSWD>.snx.Z'],
+
+         'SIO_sol_snx': ['ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/SIO0OPSFIN_<YYYY><DOY>0000_01D_01D_SOL.SNX.gz',
+                         'ftp://igs.gnsswhu.cn/pub/gps/products/<GPSW>/sio<GPSWD>.snx.Z'],
+
          "CNES_post": ["http://www.ppp-wizard.net/products/POST_PROCESSED/post_<YYYY><DOY>.tgz"],
 
          "CNES_realtime": ["http://www.ppp-wizard.net/products/REAL_TIME/cnt<GPSWD>.bia.gz",

diff --git a/FAST_src/GNSS_TYPE.py b/FAST_src/GNSS_TYPE.py
@@ -5,7 +5,7 @@
 # Copyright(C)   : The GNSS Center, Wuhan University & Chinese Academy of Surveying and mapping
 # Latest Version : 2.07
 # Creation Date  : 2022.03.27 - Version 1.00
-# Date           : 2023-01-14 - Version 2.07
+# Date           : 2023-02-10 - Version 2.07
 
 
 """
@@ -94,6 +94,7 @@
                     by Chang Chuntao  -> Version : 2.05
     2023-02-02 :    > P1C1 重复
                     + COD_F_erp
+                    + IGS_crd_snx / COD_sol_snx / ESA_sol_snx / GFZ_sol_snx / GRG_sol_snx / NGS_sol_snx / SIO_sol_snx
                     by Chang Chuntao  -> Version : 2.07
 """
 
@@ -136,7 +137,11 @@
                           "IGS_zpd", "COD_tro", "JPL_tro", "GRID_1x1_VMF3", "GRID_2.5x2_VMF1", "GRID_5x5_VMF3",
                           "Meteorological"]],
 
-             ["SINEX", ["IGS_day_snx", "IGS_week_snx", "IVS_week_snx", "ILS_week_snx", "IDS_week_snx"]],                 # 8 SINEX
+             ["SINEX", ["IGS_day_snx", "IGS_week_snx",
+                        "IVS_week_snx", "ILS_week_snx", "IDS_week_snx",
+                        'IGS_crd_snx', 'COD_sol_snx', 'ESA_sol_snx',
+                        'GFZ_sol_snx', 'GRG_sol_snx', 'NGS_sol_snx',
+                        'SIO_sol_snx']],                                                    # 8 SINEX
 
              ["CNES_AR", ["CNES_post", "CNES_realtime"]],                                                                # 9 CNES_AR
 

diff --git a/FAST_src/help.py b/FAST_src/help.py
@@ -5,7 +5,7 @@
 # Copyright(C)   : The GNSS Center, Wuhan University & Chinese Academy of Surveying and mapping
 # Latest Version : 2.07
 # Creation Date  : 2022.03.27 - Version 1.00
-# Date           : 2023-01-14 - Version 2.07
+# Date           : 2023-02-10 Version 2.07
 
 from FAST_Print import PrintGDD
 from GNSS_TYPE import gnss_type
@@ -36,7 +36,7 @@
                 '2022-12-02',
                 '2022-12-04',
                 '2023-01-14',
-                '2023-02-02']
+                '2023-02-10']
 
 
 def Supported_Data():

diff --git a/FAST_src/win_bin/FAST.exe b/FAST_src/win_bin/FAST.exe
diff --git a/Linux/FAST b/Linux/FAST
diff --git a/Win_QT/FAST-QT.exe b/Win_QT/FAST-QT.exe
diff --git a/Win_QT/win_bin/FAST.exe b/Win_QT/win_bin/FAST.exe
diff --git a/Windows/FAST.exe b/Windows/FAST.exe