Skip to content

Commit

Permalink
Merge branch 'v6.2.0/devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
emiola committed Aug 24, 2016
2 parents 84400c6 + 1695f47 commit ed286df
Show file tree
Hide file tree
Showing 256 changed files with 10,786 additions and 2,795 deletions.
81 changes: 81 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,84 @@
6.2.0 (2016-08-23)

Engine
- Add: new supported variable "anemometer_diagnostic". If selected,
it filters anemometer data if the diagnostic value is different from zero.
- Add: now biomet variables that are provided without positional qualifiers
are by default given a "null qualifier" in the form of _0_0_n, with n
progressing from 1. This applies now also to external biomet files, which
means that users no longer need to assign 'fake' positional qualifiers to
variables
- Add: support of Gill WindMaster and WindMaster Pro "w-boost"
correction, necessary to fix firmware bug for firmware versions:
[2329.x.y with x<700].
- Refine: AoA correction policy. Now Nakai et al. 2006 is applied only to
R3 family and R2. Nakai and Shimoyama 2012 is applied to WindMaster and
WindMaster Pro. The combination of "w-boost" and AoA correction for
the WindMaster/Pro is handled automatically by EddyPro. Effectively,
the user as the options of (1) applying or not the w-boost correction
alone for WindMaster/Pro; (2) applying or not Nakai's AoA corrections.
However, EddyPro controls that both corrections are applicable to the
current anemometer and overrides user's settings (and output
corresponding warnings) if necessary.
- Refine: now planar fit settings are not read if planar-fit file is used.
The useless reading operation did not cause any problems.
- Refine: changed "time lag" into "time-lag" everywhere
- Fix: shut down BA/ZOH correction, which is currently implemented but not
exposed via the GUI.
- Fix: Kelvin/Celsius conversion factor harmonised everywhere (273.15 instead
of some occurring 273.16)
- Fix: now biomet data is not read in during planar fit (which was never
useful anyway) and this fixes an array allocation issue that was causing
a crash when both planar fit and biomet data were used.
- Fix: eliminate 'allocatable' property for TempFact in drift_correction.f90,
which is however not yet enabled, so it was causing no issues.
- Fix: missing time-lag optimization file when requested caused tilt correction
method to be set to inexistent value and thus default to no correction
- Fix: flags for absolute limits is now correctly calculated. Flags for
this test obtained so far are unreliable.
- Fix: output of full (co)spectra. The bug was such that there was a
mis-alignment of one data point between frequencies and associated
(co)spectra values. The bug did not affect calculation and output of
binned cospectra, nor usage of full cospectra in spectral corrections.
- Fix: now files with timestamp referring to end of the dataset are
processed correctly. The bug did not allow processing them in rather
unusual (but not impossible) situations, such as when files shorter
than the flux averaging interval were processed.
- Fix: handle inconsistent selection of embedded biomet data and non-GHG
file type. This pair of inconsistent settings is not possible with the GUI,
only with manual editing of the .eddypro file.
- Fix: definitions of Hamming and Hann windows were mistakenly inverted.
Now they are correct. The difference between the two windows is anyway
minimal and resulting binned (co)spectra are thus only minimally
affected, and only at the low frequency end.

GUI
- Fix: make non blocking a zero flow rate gas analyzer description.
- Fix: make sure that an ignored variable in the metadata raw file description
table has almost all the fields disabled.
- Fix: toolbar with no labels in initial maximized state.
- Fix: inconsistent value of the data set available date on the detect
range dialog showing when running in advanced mode.

- Refine: make sure that on Mac is possible to load any kind of external
biomet files.
- Refine: remove italic from anemometer firmware version.
- Refine: trim spaces reading variables in external biomet files.

- Add: set the Angle of Attack checkbox default setting to disabled.
- Add: "Build Continuous Dataset" to the Minimal Advanced Output Settings
(the current default).
- Add: some textual hint in the metadata tables.
- Add: accept Gill Windmaster/Pro two or three fields firmware versions.
- Add: change max plausibility range from 12 to 20 sigma as per user request.
- Add: enable drag and drop tips on Windows.
- Add: the registered trademark symbol to the main window title.
- Add: master Anemometer Flags combo in Basic Settings page.
- Add: support for Campbell CSAT-3B.
- Add: raise variable flags decimals from 4 to 10 digits.
- Add: make anemometer firmware version mandatory for Gill WindMaster/Pro.
- Add: checkbox for Gill's w-boost bug.

6.1.0 (2015-12-14)

Engine
Expand Down
28 changes: 4 additions & 24 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,16 @@ The EddyPro installer installs the following components:

Both are pre-built for a particular environment (operating system and compiler).


##Source Code Repository

EddyPro is a fully cross-platform application, which consists of a set of
command line programs and a graphical user interface (GUI).

The source code is developed using two independent Git repositories, namely:


- eddypro-engine
- eddypro-gui


## Installing EddyPro

You can download EddyPro from the LI-COR
Expand All @@ -52,15 +49,14 @@ Start the installation program like any executable on the development platform.
Select the components that you want to install and follow the instructions of
the installation program to complete the installation.


## Building EddyPro from source

To build EddyPro follow these instructions:


### Engine

To compile the Engine use [gfortran](https://gcc.gnu.org/wiki/GFortran) (The GNU Fortran compiler) and run:
To compile the Engine use [gfortran](https://gcc.gnu.org/wiki/GFortran)
(The GNU Fortran compiler) and run:

$ make Makefile_rp
$ make Makefile_fcc
Expand Down Expand Up @@ -116,7 +112,6 @@ following command line utilities under the 'bin' sub-directory:
- 7-zip
- pausep


### 7-zip

[7-Zip](http://www.7-zip.org/) is a file archiver.
Expand All @@ -138,13 +133,11 @@ It consists of one file:
License: Code Project Open License,
[CPOL](http://www.codeproject.com/info/cpol10.aspx).


## Using EddyPro sample data

You can run EddyPro using sample data files available in the LI-COR
[EddyPro website](http://www.licor.com/eddypro).


## Data Processing Options in EddyPro

+ Axis rotation for sonic anemometer tilt correction
Expand All @@ -153,22 +146,19 @@ You can run EddyPro using sample data files available in the LI-COR
- Sector-wise planar fit (Wilczak et al., 2001)
- Sector-wise planar fit with no velocity bias (van Dijk et al., 2004)


+ Detrending of raw time series
- Block averaging
- Linear detrending
- Running mean
- Exponential running mean


+ Compensation of time lag between sonic anemometer and gas analyzer measurements
- Automatic time lag optimization (optionally as a function of RH for H<sub>2</sub>O)
- Maximum covariance with default (circular correlation)
- Maximum covariance without default
- Constant
- None (option to not apply compensation)


+ Statistical tests for raw time series data (Vickers and Mahrt, 1997)
- Spike count/removal (Mauder et al., 2013)
- Amplitude resolution
Expand All @@ -181,14 +171,12 @@ You can run EddyPro using sample data files available in the LI-COR
- Steadiness of horizontal wind
- Individually selectable and customizable


+ Compensation for air density fluctuations
- Webb et al., 1980 (open path) / Ibrom et al., 2007a (closed path)
- Use (or convert to) mixing ratio (Burba et al., 2012)
- Optional off-season upatake correction for LI-7500 (Burba et al., 2008)
- None (option to not apply compensation)


+ Correction for frequency response (attenuation)
- Analytic high-pass filtering correction (Moncrieff et al., 2004)
- Low-pass filtering, select and configure:
Expand All @@ -199,32 +187,27 @@ You can run EddyPro using sample data files available in the LI-COR
- Horst and Lenschow (2009)
- Fratini et. al. (2012)


+ Quality control tests for fluxes according to Foken et al. (2004)
- Flagging according to Carbo Europe standard (Mauder and Foken, 2004)
- Flagging according to Foken (2003)
- Flagging after Göckede et al. (2004)


+ Random uncertainty estimation
- Mann and Lenschow (1994)
- Finkelstein and Sims (2001)


+ Flux footprint estimation
- Kljun et al. (2004)
- Kormann and Meixner (2001)
- Hsieh et al. (2000)


+ Other options applied in both Express and/or Advanced Mode include:
- Sonic temperature correction for humidity following van Dijk et al. (2004)
- Spectroscopic correction for LI-7700 following McDermitt et al. (2011)
- Angle of attack corrections for Gill anemometers following Nakai et al. (2006)
- Angle of attack corrections for Gill anemometers following Nakai and Shimoyama (2012)
- Inclusion of biomet data for improved flux computation/correction


+ Available outputs
- Full (rich) output with fluxes, quality flags and much more (standard format
or available results only)
Expand All @@ -240,27 +223,24 @@ You can run EddyPro using sample data files available in the LI-COR
- Raw data time series after each statistical tests/correction
- Averaged biomet data


## EddyPro Trademark and Logo Policy

In order to help users who want to cite EddyPro on posters or publications,
LI-COR provides [guidelines](docs/EddyPro_Trademark_Policy.pdf) for the proper
use of the EddyPro wordmark and logo.


## Want to Know More?

More information is available at:

- http://www.licor.com/eddypro
- http://www.licor.com/env/help/eddypro/topics_eddypro/EddyPro_Home.html
- [EddyPro web page](http://www.licor.com/eddypro)
- [EddyPro help](http://www.licor.com/env/help/eddypro/topics_eddypro/EddyPro_Home.html)

Be sure to check out the
'[What's new](http://www.licor.com/env/help/eddypro/topics_eddypro/Whats_New.html)'
page, which will list any known problems or limitations of the current and
past versions.


See also the [CHANGELOG](CHANGELOG).

---
Expand Down
Binary file modified docs/EddyPro_Manual_12025.pdf
Binary file not shown.
137 changes: 137 additions & 0 deletions eddypro_lin.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,137 @@
# EddyPro qmake project file

TEMPLATE = app

# EddyPro version
VER_MAJ = 6
VER_MIN = 2
VER_PAT = 0
VERSION = $$sprintf("%1.%2.%3",$$VER_MAJ,$$VER_MIN,$$VER_PAT)

# Qt version and path
QT_VER = $$[QT_VERSION]
QT_PATH = $$[QT_INSTALL_PREFIX]

# Qt config
QT += core gui widgets network concurrent
CONFIG += warn_on
CONFIG += debug_and_release
CONFIG += c++11

# Build tree with shadow building approach
include(build_tree.pri)

# Include paths
include(includes.pri)

# Libs to build and link
include(libs.pri)

# Platform specific configurations
include(platform.pri)

# Resource files
include(resources.pri)

# Source code files
include(sources.pri)

# Extra targets for automated tests
include(tests.pri)

CONFIG(debug, debug|release) {
TARGET = eddypro_debug
CONFIG += console

DEFINES += QT_DEBUG

# to suppress qt and 3rdparty library warnings
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/include"
QMAKE_CXXFLAGS += -isystem "$$_PRO_FILE_PWD_/libs/quazip-0.7.1/quazip"

win32 {
# mingw warnings
QMAKE_CXXFLAGS_WARN_ON += -pedantic -Wall -Wextra -Wdeprecated -Wcast-qual -Wwrite-strings -fdiagnostics-show-option
QMAKE_CXXFLAGS_WARN_ON += -O0 -fno-inline -Wunused-result

# to suppress compiler library warnings
QMAKE_CXXFLAGS += -isystem "$$_PRO_FILE_PWD_/../../../libs/c++/boost_1_61_0"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/../Tools/mingw492_32"
}
macx {
QMAKE_CXXFLAGS += --system-header-prefix=boost/
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtCore.framework/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtCore.framework/Versions/5/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtGui.framework/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtGui.framework/Versions/5/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtWidgets.framework/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtWidgets.framework/Versions/5/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtConcurrent.framework/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtConcurrent.framework/Versions/5/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtNetwork.framework/Headers"
QMAKE_CXXFLAGS += -isystem "$$QT_PATH/lib/QtNetwork.framework/Versions/5/Headers"

QMAKE_CXXFLAGS_WARN_ON += -Weverything
QMAKE_CXXFLAGS_WARN_ON += -Wno-c++98-compat -Wno-c++98-compat-pedantic
QMAKE_CXXFLAGS_WARN_ON += -Wno-padded
QMAKE_CXXFLAGS_WARN_ON += -Wno-covered-switch-default
QMAKE_CXXFLAGS_WARN_ON += -Wno-used-but-marked-unused # see http://lists.qt-project.org/pipermail/development/2014-March/016181.html
QMAKE_CXXFLAGS_WARN_ON += -Wno-global-constructors # static objects
QMAKE_CXXFLAGS_WARN_ON += -Wno-exit-time-destructors # static objects
QMAKE_CXXFLAGS_WARN_ON += -Wno-documentation -Wno-documentation-unknown-command -Wno-documentation-deprecated-sync

QMAKE_PRE_LINK += && $$_PRO_FILE_PWD_/scripts/build/mac-update-translations.sh$$escape_expand(\\n\\t)
}
unix {
QMAKE_CXXFLAGS += -isystem "$$_PRO_FILE_PWD_/../../../libs/c++/boost_1_61_0"

#QMAKE_CXXFLAGS_WARN_ON += -Wno-c++98-compat -Wno-c++98-compat-pedantic
#QMAKE_CXXFLAGS_WARN_ON += -Wno-padded
#QMAKE_CXXFLAGS_WARN_ON += -Wno-covered-switch-default
#QMAKE_CXXFLAGS_WARN_ON += -Wno-used-but-marked-unused # see http://lists.qt-project.org/pipermail/development/2014-March/016181.html
#QMAKE_CXXFLAGS_WARN_ON += -Wno-global-constructors # static objects
#QMAKE_CXXFLAGS_WARN_ON += -Wno-exit-time-destructors # static objects
#QMAKE_CXXFLAGS_WARN_ON += -Wno-documentation -Wno-documentation-unknown-command -Wno-documentation-deprecated-sync
}
} else {
TARGET = eddypro

DEFINES -= QT_DEBUG
DEFINES += QT_NO_DEBUG
DEFINES += QT_NO_DEBUG_OUTPUT
DEFINES += QT_NO_WARNING_OUTPUT

macx {
QMAKE_PRE_LINK += && $$_PRO_FILE_PWD_/scripts/build/mac-update-translations.sh$$escape_expand(\\n\\t)

# remove debug symbols
QMAKE_POST_LINK += && strip -S $$OUT_PWD/release/eddypro.app/Contents/MacOS/eddypro
}
}

DEFINES += QT_NO_CAST_FROM_ASCII
DEFINES += QT_NO_CAST_FROM_BYTEARRAY
DEFINES += QT_NO_CAST_TO_ASCII
DEFINES += QT_NO_URL_CAST_FROM_STRING
DEFINES += QT_USE_QSTRINGBUILDER

#message(Qt version: $$QT_VERSION)
#message(Qt is installed in $$QT_INSTALL_PREFIX)
#message(Qt resources can be found in the following locations:)
#message(Documentation: $$QT_INSTALL_DOCS)
#message(Header files: $$QT_INSTALL_HEADERS)
#message(Libraries: $$QT_INSTALL_LIBS)
#message(Binary files (executables): $$QT_INSTALL_BINS)
#message(Plugins: $$QT_INSTALL_PLUGINS)
#message(Data files: $$QT_INSTALL_DATA)
#message(Translation files: $$QT_INSTALL_TRANSLATIONS)
#message(Settings: $$QT_INSTALL_SETTINGS)
#message(Examples: $$QT_INSTALL_EXAMPLES)
#message(Demonstrations: $$QT_INSTALL_DEMOS)

#build_pass:message(QMAKE_CFLAGS: $$QMAKE_CFLAGS)
#build_pass:message(QMAKE_CXXFLAGS: $$QMAKE_CXXFLAGS)
#message(QMAKE_CXXFLAGS: $$QMAKE_CXXFLAGS)

# workaround for QTBUG-34424
TR_EXCLUDE += $$_PRO_FILE_PWD_/../../../libs/c++/boost_1_61_0/*
Loading

0 comments on commit ed286df

Please sign in to comment.