Release v2.1.2

kartverket · Jun 2, 2023 · b8cb3a4 · b8cb3a4
1 parent d7e4e52
commit b8cb3a4
Show file tree

Hide file tree

Showing 62 changed files with 961 additions and 534 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.1.0
+current_version = 2.1.2
 commit = False
 tag = False
 

diff --git a/Makefile b/Makefile
@@ -6,6 +6,9 @@
 # * Geir Arne Hjelle <[email protected]>
 
 # Programs and directories
+# Note from 'dahmic': It seems to be that 'f2py' could not be installed at on a Rocky 8.7 operativ system. 'numpy' has 
+#                     overtaken the 'f2py' project. Therefore I used 'F2PY = python -m numpy.f2py' instead of 
+#                     'F2PY=f2py.
 F2PY = f2py
 F2PYEXTENSION = .cpython-36m-x86_64-linux-gnu.so
 

diff --git a/config/where.conf b/config/where.conf
@@ -281,13 +281,13 @@ fields:help  = Define fields for which system tests should be applied.
 
 
 #______________________________________________________________________________________________________________________
-#[troposphere_radio]
+[troposphere_radio]
 #:help   = Troposphere modelling specification. In priniciple only the mapping function model has to be defined, which
 #          are:
 #            mapping_function:          gmf, gpt2, gpt2w, vmf1_gridded
 #        
 #          Depending on the chosen model following meteorological data (MET), zenith hydrostatic
-#          delay (ZHD), zenith wet delay models (ZWD) and gradient models (GRAD) are used:
+#          delay (ZHD), zenith wet delay models (ZWD) and gradient models (GRAD) are recommended to use:
 #        
 #            MAP. FUNC     MET           ZHD              ZWD           GRAD
 #            ____________________________________________________________________
@@ -301,114 +301,122 @@ fields:help  = Define fields for which system tests should be applied.
 #          determination can only be used together with GPT2w, which provides the correct input parameters for the Askne
 #          model. Following models are available:
 #        
-#            meteorological_data:       gpt, gpt2, gpt2w, site_pressure, vmf1_gridded
-#            zenith_hyrdostatic_delay:  saastamoinen
-#            zenith_wet_delay:          none, askne, davis, saastamoinen, vmf1_gridded
+#            meteorological_data:       default, gpt, gpt2, gpt2w, site_pressure, vmf1_gridded, vmf1_station
+#            zenith_hyrdostatic_delay:  saastamoinen, vmf1_gridded, vmf1_station
+#            zenith_wet_delay:          none, askne, davis, saastamoinen, vmf1_gridded, vmf1_station
 #            gradients:                 none, apg
-#        
-#gradients                   = apg
-#gradients:help              = Define tropospheric asymmetric delay model. Following models are available:
-#                                 apg:  IERS routine APG.F used. See Section 9.2 in IERS2010.
-#                                 none: No model applied.
-#                                 
-#mapping_function            = vmf1_gridded
-#mapping_function:help       = Define mapping function model. Following models are available:
-#                                gmf:   Global Mapping Function (GMF) (J. Böhm, Niell, et al. 2006).
-#                                gpt2:  Mapping function based on Global Pressure and Temperature model 2 (GPT2) (Lagler 
-#                                       et al. 2013).
-#                                gpt2w: Mapping function based on Global Pressure and Temperature model 2 wet (GPT2w)
-#                                       (J. Böhm, Moeller, et al. 2015).
-#                                vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
-#                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
-#                                              defined in configuration file.
-#                                              
-#meteorological_data         = vmf1_gridded
-#meteorological_data:help    = Define meteorological data model. Following models are available:
-#                                gpt:   Global Pressue Temperature (GPT) model (J. Böhm, Heinkelmann, and Schuh 2007).
-#                                gpt2:  Mapping function based on Global Pressure and Temperature model 2 (GPT2) (Lagler 
-#                                       et al. 2013).
-#                                gpt2w: Mapping function based on Global Pressure and Temperature model 2 wet (GPT2w)
-#                                       (J. Böhm, Moeller, et al. 2015).
-#                                site_pressure: Use local site pressure information.
-#                                vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
-#                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
-#                                              defined in configuration file.
-#
-#zenith_hydrostatic_delay    = saastamoinen
-#zenith_hydrostatic_delay:help = Define zenith hydrostatic troposphere delay model. Following models are available:
-#                                 saastamoinen: See model in Saastamoinen (1972).
-
-#zenith_wet_delay            = vmf1_gridded
-#zenith_wet_delay:help       = Define zenith wet troposphere delay model. Following models are available:
-#                                 gpt:  Global Pressure Temperature (GPT) model (J. Böhm, Heinkelmann, and Schuh 2007).
-#                                 askne: See Askne and Nordius (1987).
-#                                 davis: Based on Fortran routine http://acc.igs.org/tropo/wetsaas.f
-#                                 saastamoinen: See model in Saastamoinen (1972).
-#                                 vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
-#                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
-#                                              defined in configuration file.
-#
-#
+#  
+
+gradients                   = apg
+gradients:help              = Define tropospheric asymmetric delay model. Following models are available:
+                                 apg:  IERS routine APG.F used. See Section 9.2 in IERS2010.
+                                 none: No model applied.
+
+mapping_function            = vmf1_gridded
+mapping_function:help       = Define mapping function model. Following models are available:
+                                gmf:   Global Mapping Function (GMF) (J. Böhm, Niell, et al. 2006).
+                                gpt2:  Mapping function based on Global Pressure and Temperature model 2 (GPT2) (Lagler 
+                                       et al. 2013).
+                                gpt2w: Mapping function based on Global Pressure and Temperature model 2 wet (GPT2w)
+                                       (J. Böhm, Moeller, et al. 2015).
+                                vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
+                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
+                                              defined in configuration file.
+
+                                vmf1_station: TODO
+
+meteorological_data         = vmf1_gridded
+meteorological_data:help    = Define meteorological data model. Following models are available:
+                                default: TODO
+                                gpt:   Global Pressue Temperature (GPT) model (J. Böhm, Heinkelmann, and Schuh 2007).
+                                gpt2:  Mapping function based on Global Pressure and Temperature model 2 (GPT2) (Lagler 
+                                       et al. 2013).
+                                gpt2w: Mapping function based on Global Pressure and Temperature model 2 wet (GPT2w)
+                                       (J. Böhm, Moeller, et al. 2015).
+                                site_pressure: Use local site pressure information.
+                                vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
+                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
+                                              defined in configuration file.
+                                vmf1_station: TODO
+
+zenith_hydrostatic_delay    = saastamoinen
+zenith_hydrostatic_delay:help = Define zenith hydrostatic troposphere delay model. Following models are available:
+                                 saastamoinen: See model in Saastamoinen (1972).
+                                 vmf1_gridded: TODO
+                                 vmf1_station: TODO
+
+zenith_wet_delay            = vmf1_gridded
+zenith_wet_delay:help       = Define zenith wet troposphere delay model. Following models are available:
+                                 askne: See Askne and Nordius (1987).
+                                 davis: Based on Fortran routine http://acc.igs.org/tropo/wetsaas.f
+                                 none: No model applied.
+                                 saastamoinen: See model in Saastamoinen (1972).
+                                 vmf1_gridded: Vienna Mapping Function 1 (VMF1) based on gridded data files (J. Böhm,
+                                              Werl, and Schuh 2006). File keys 'vlbi' and 'orography_ell' has to be
+                                              defined in configuration file.
+                                 vmf1_station: TODO
+
+
 #______________________________________________________________________________________________________________________
-#[trop_grad]
-#:help   =  Configuration for estimating troposphere gradients.
-#
-#apriori_rate_stdev      = 1
-#apriori_rate_stdev:help = Apriori standard deviation of parameter rate used to initialize predicted state vector 
-#                          covariance. Only relevant if option 'estimate_method' is set to 'cpwl'. Unit is defined via
-#                          estimation option 'unit'.
-#
-#apriori_stdev           = 1
-#apriori_stdev:help      = Apriori standard deviation of parameter used to initialize predicted state. Unit is defined 
-#                          via estimation option 'unit'.
-#
-#display_unit            = meter
-#display_unit:help       = Unit used to display in There.
-#
-#epoch                   =
-#epoch:help              = Estimation epoch for parameters estimated as pwlo. Only applicable for parameters defined in 
-#                          estimate_constant. Format: HH:MM:SS
-#                          
-#knot_interval           = 21600
-#knot_interval:library
-#knot_interval:help      = Number of seconds for each knot interval for parameters in (1) estimate_stochastic if estimator 
-#                          'cpwl' (continuous piecewise linear) is used or (2) estimate_constant if epoch is defined
-#                          (meaning the parameters are estimated as pwlo (piecewise linear offsets). Unit is 
-#                          defined via estimation option 'unit'.
-#
-#process_noise           = 100
-#process_noise:help      = Define parameter process noise Kalman filter. Unit is defined via estimation option 'unit'.
-#
-#skip_stations           =
-#skip_stations:library
-#skip_stations:help      = Comma separated list of station names, for which estimation of station related parameters
-#                          is skipped like tropospheric gradients.
-#
-#unit                    = m
-#unit:help               = Unit definition used as unit for other estimation options.
-#
-#
+[trop_grad]
+:help   =  Configuration for estimating troposphere gradients.
+
+apriori_rate_stdev      = 1
+apriori_rate_stdev:help = Apriori standard deviation of parameter rate used to initialize predicted state vector 
+                          covariance. Only relevant if option 'estimate_method' is set to 'cpwl'. Unit is defined via
+                          estimation option 'unit'.
+
+apriori_stdev           = 1
+apriori_stdev:help      = Apriori standard deviation of parameter used to initialize predicted state. Unit is defined 
+                          via estimation option 'unit'.
+
+display_unit            = meter
+display_unit:help       = Unit used to display in There.
+
+epoch                   =
+epoch:help              = Estimation epoch for parameters estimated as pwlo. Only applicable for parameters defined in 
+                          estimate_constant. Format: HH:MM:SS
+
+knot_interval           = 21600
+knot_interval:library
+knot_interval:help      = Number of seconds for each knot interval for parameters in (1) estimate_stochastic if estimator 
+                          'cpwl' (continuous piecewise linear) is used or (2) estimate_constant if epoch is defined
+                          (meaning the parameters are estimated as pwlo (piecewise linear offsets). Unit is 
+                          defined via estimation option 'unit'.
+
+process_noise           = 100
+process_noise:help      = Define parameter process noise Kalman filter. Unit is defined via estimation option 'unit'.
+
+skip_stations           =
+skip_stations:library
+skip_stations:help      = Comma separated list of station names, for which estimation of station related parameters
+                          is skipped like tropospheric gradients.
+
+unit                    = m
+unit:help               = Unit definition used as unit for other estimation options.
+
+
 #______________________________________________________________________________________________________________________                                              
-#[trop_wet]
-#:help   = Configuration for estimating troposphere wet delay. See explanation of following option under 'trop_grad'
-#          section.
-#
-#apriori_rate_stdev    = 1
-#apriori_stdev         = 1
-#display_unit          = meter
-#epoch                 =
-#epoch:help            = Estimation epoch for parameters estimated as pwlo. Only applicable for parameters defined in 
-#                        estimate_constant. 
-#knot_interval         = 3600
-#knot_interval:library
-#knot_interval:help      = Number of seconds for each knot interval for parameters in (1) estimate_stochastic if estimator 
-#                          'cpwl' (continuous piecewise linear) is used or (2) estimate_constant if epoch is defined
-#                          (meaning the parameters are estimated as pwlo (piecewise linear offsets). Unit is 
-#                          defined via estimation option 'unit'.
-#process_noise         = 100
-#skip_stations         =
-#skip_stations:library
-#unit                  = m
+[trop_wet]
+:help   = Configuration for estimating troposphere wet delay. See explanation of following option under 'trop_grad'
+          section.
+
+apriori_rate_stdev    = 1
+apriori_stdev         = 1
+display_unit          = meter
+epoch                 =
+epoch:help            = Estimation epoch for parameters estimated as pwlo. Only applicable for parameters defined in 
+                        estimate_constant. 
+knot_interval         = 3600
+knot_interval:library
+knot_interval:help      = Number of seconds for each knot interval for parameters in (1) estimate_stochastic if estimator 
+                          'cpwl' (continuous piecewise linear) is used or (2) estimate_constant if epoch is defined
+                          (meaning the parameters are estimated as pwlo (piecewise linear offsets). Unit is 
+                          defined via estimation option 'unit'.
+process_noise         = 100
+skip_stations         =
+skip_stations:library
+unit                  = m
 
 
 # Information about users of the software. The list should be key'ed by the username, and the info should contain a

diff --git a/config/where_pipeline_vlbi.conf b/config/where_pipeline_vlbi.conf
@@ -791,7 +791,7 @@ statistics                  = variance factor, degrees of freedom
 func                        = num:obs-calculate, num:obs-estimate, rms:residual-calculate, rms:residual-estimate,
                               num_clock_breaks, count:station-estimate
 meta                        = network_volume
-meta_index                  = scheduled_obs
+meta_index                  = num_obs_schedule, num_obs_read
 state                       = ${vlbi:estimate_constant}, ${vlbi:estimate_stochastic}
 
 # Writer for Sinex file

diff --git a/docs/archives.html b/docs/archives.html
@@ -79,9 +79,13 @@
     <section id="content">
       <h1>Archives for Where</h1>
         <div id="archives">
+                <p>
+                    <span class="categories-timestamp"><time datetime="2023-06-02T00:00:00+02:00">fr. 02 juni 2023</time></span>
+                    <a href="https://kartverket.github.io/where/where-latest.html">Where v2.1.2</a>
+                </p>
                 <p>
                     <span class="categories-timestamp"><time datetime="2023-02-24T00:00:00+01:00">fr. 24 februar 2023</time></span>
-                    <a href="https://kartverket.github.io/where/where-latest.html">Where v2.1.0</a>
+                    <a href="https://kartverket.github.io/where/where-v210.html">Where v2.1.0</a>
                 </p>
                 <p>
                     <span class="categories-timestamp"><time datetime="2023-02-01T00:00:00+01:00">on. 01 februar 2023</time></span>

diff --git a/docs/author/norwegian-mapping-authority.html b/docs/author/norwegian-mapping-authority.html
@@ -77,12 +77,19 @@
     <div class="row">
         <div class="col-sm-9">
             <article>
-                <h2><a href="https://kartverket.github.io/where/where-latest.html">Where v2.1.0</a></h2>
-                <div class="summary"><p>Download Where v2.1.0.</p>
+                <h2><a href="https://kartverket.github.io/where/where-latest.html">Where v2.1.2</a></h2>
+                <div class="summary"><p>Download Where v2.1.2.</p>
                     <a class="btn btn-default btn-xs" href="https://kartverket.github.io/where/where-latest.html">more ...</a>
                 </div>
             </article>
             <hr/>
+            <article>
+                <h2><a href="https://kartverket.github.io/where/where-v210.html">Where v2.1.0</a></h2>
+                <div class="summary"><p>Download Where v2.1.0.</p>
+                    <a class="btn btn-default btn-xs" href="https://kartverket.github.io/where/where-v210.html">more ...</a>
+                </div>
+            </article>
+            <hr/>
             <article>
                 <h2><a href="https://kartverket.github.io/where/where-v201.html">Where v2.0.1</a></h2>
                 <div class="summary"><p>Download Where v2.0.1.</p>
@@ -139,13 +146,6 @@ <h2><a href="https://kartverket.github.io/where/where-v110.html">Where v1.1.0</a
                 </div>
             </article>
             <hr/>
-            <article>
-                <h2><a href="https://kartverket.github.io/where/where-v104.html">Where v1.0.4</a></h2>
-                <div class="summary"><p>Download Where v1.0.4.</p>
-                    <a class="btn btn-default btn-xs" href="https://kartverket.github.io/where/where-v104.html">more ...</a>
-                </div>
-            </article>
-            <hr/>
 
         <ul class="pagination">
                 <li class="prev disabled"><a href="#">&laquo;</a></li>