• Peters, Wouter's avatar
    Added new aggregation routines, and expanded existing ones. The routines and their changes are: · 89844dce
    Peters, Wouter authored
    1) 1x1 fluxes
    Cycle fluxes are now written in cycle-by-cycle files instead of all into one file. This makes file handling easier. Also, I now 
    write the full ensemble of 1x1 fluxes to each file, resulting in much more data. The advantage is that this data can be used to post-
    aggregate to any mapping needed, including mapping of the full covariance through the ensemble.
    2) State fluxes
    State fluxes are also written per cycle for the same reasons.
    3) Olson fluxes
    mean fluxes as well as the ensemble are aggregated to 240 regions (11*19 Olson ecosystems and 30 Ocean regions)
    4) TransCom fluxes
    mean fluxes as well as the ensemble are aggregated to 23 regions. This is similar to the dedicated routine to make TransCom
    fluxes. The disadvantage is that the dedicated routine uses a staevector-to-transcom mapping which is required to be part of the 
    Statevector, whereas this is not needed for the new routine. From the ensemble, aggregated fluxes and TransCom covariance can be constructed.
    5) Country fluxes
    mean and ensemble fluxes are written for a number of large countries (USA, China, Russia, EU27, Brazil,...). This routine can in principle handle all countries of the World, but small countries get unreliable fluxes because of aggregation errors, and the uncertainty on the parameters on smaller scales.
    For the aggregation, several dictionary are used to map from the grid to the aggregate regions. These are pickled to make the routine faster, and provided also through SVN.