1. 01 Feb, 2013 4 commits
  2. 29 Nov, 2012 3 commits
  3. 20 Nov, 2012 1 commit
  4. 15 Nov, 2012 7 commits
  5. 31 Oct, 2012 2 commits
  6. 30 Oct, 2012 1 commit
  7. 29 Oct, 2012 2 commits
  8. 25 Oct, 2012 1 commit
    • karolina's avatar
      First portion of cleanup: · abd55518
      karolina authored
      - reduced to one the two-command messages logging 
      - removed unnecessary commas and brackets in tuples definition
      - removed unused imports
      - __str__ definition: changed print to return
      - removed unused values attribution ("dummy = ...")
      - formatted the code
      - repaired bad indentation
      - removed dummy returns ("return None")
      - removed non-meaning body of baseclasses.optimizer.Localize()
      abd55518
  9. 02 Oct, 2012 1 commit
  10. 01 Oct, 2012 8 commits
    • Peters, Wouter's avatar
      clean up of unneeded imports · 6383d344
      Peters, Wouter authored
      6383d344
    • Peters, Wouter's avatar
      needed minor update · 70d83bba
      Peters, Wouter authored
      70d83bba
    • Peters, Wouter's avatar
      needed for country aggregation · faf9475a
      Peters, Wouter authored
      faf9475a
    • Peters, Wouter's avatar
      needed for country aggregation · 3eaf7fc4
      Peters, Wouter authored
      3eaf7fc4
    • Peters, Wouter's avatar
      fb87545b
    • Peters, Wouter's avatar
      extra var needed · 68b1f882
      Peters, Wouter authored
      68b1f882
    • Peters, Wouter's avatar
      extra var needed · 522dbff1
      Peters, Wouter authored
      522dbff1
    • 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.
      
      
      89844dce
  11. 26 Sep, 2012 2 commits
  12. 04 Sep, 2012 3 commits
  13. 03 Sep, 2012 5 commits