Skip to content
GitLab
  1. 28 Jul, 2017 1 commit
  3. 27 Jul, 2017 1 commit
  5. 17 Jul, 2017 2 commits
    • Javier Vegas-Regidor's avatar
      Merged · 39001ab9
      Javier Vegas-Regidor authored
      39001ab9
    • Javier Vegas-Regidor's avatar
      Merge branch 'master' into devel_better_data_management · 198c0bca
      Javier Vegas-Regidor authored 
      # Conflicts:
#	VERSION
#	diags.conf
#	earthdiagnostics/cdftools.py
#	earthdiagnostics/cmormanager.py
#	earthdiagnostics/config.py
#	earthdiagnostics/datamanager.py
#	earthdiagnostics/diagnostic.py
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/general/module.py
#	earthdiagnostics/general/select_levels.py
#	earthdiagnostics/general/simplify_dimensions.py
#	earthdiagnostics/ocean/heatcontentlayer.py
#	earthdiagnostics/ocean/interpolatecdo.py
#	earthdiagnostics/ocean/mask_land.py
#	earthdiagnostics/utils.py
#	test/unit/__init__.py
#	test/unit/test_heatcontent.py
      198c0bca
  7. 12 Jul, 2017 5 commits
  9. 07 Jul, 2017 2 commits
  11. 06 Jul, 2017 3 commits
  13. 05 Jul, 2017 2 commits
  15. 04 Jul, 2017 1 commit
  17. 03 Jul, 2017 1 commit
  19. 29 Jun, 2017 1 commit
  21. 28 Jun, 2017 1 commit
  23. 27 Jun, 2017 1 commit
  25. 23 Jun, 2017 1 commit
  27. 21 Jun, 2017 1 commit
  29. 20 Jun, 2017 1 commit
  31. 19 Jun, 2017 3 commits
  33. 16 Jun, 2017 3 commits
  35. 15 Jun, 2017 2 commits
  37. 14 Jun, 2017 1 commit
  39. 06 Jun, 2017 4 commits
  41. 02 Jun, 2017 3 commits
    • Javier Vegas-Regidor's avatar
      Merge branch 'master' into devel_better_data_management · 2437ea4d
      Javier Vegas-Regidor authored 
      # Conflicts:
#	VERSION
#	diags.conf
#	earthdiagnostics/datamanager.py
#	earthdiagnostics/earthdiags.py
#	earthdiagnostics/general/dailymean.py
#	earthdiagnostics/general/monthlymean.py
#	earthdiagnostics/general/select_levels.py
#	earthdiagnostics/general/simplify_dimensions.py
#	earthdiagnostics/general/yearlymean.py
#	earthdiagnostics/ocean/heatcontent.py
#	earthdiagnostics/ocean/mixedlayerheatcontent.py
#	earthdiagnostics/ocean/mixedlayersaltcontent.py
#	earthdiagnostics/ocean/moc.py
#	earthdiagnostics/ocean/regionmean.py
#	setup.py
      2437ea4d
    • Javier Vegas-Regidor's avatar
      Updated cmor tables · dbcf843e
      Javier Vegas-Regidor authored
      dbcf843e
    • Javier Vegas-Regidor's avatar
      Fixed bug in Basin comparison · a10505a4
      Javier Vegas-Regidor authored
      a10505a4