Commits · 56f3c2e966131b939031d716d97ce33e283483e4 · Sergey Osipov / hermesv3_gr

13 Mar, 2019 1 commit
- Disconnected CAMS-GLOB solvent, fossil fuel fire and waste burning sectors · 56f3c2e9
  mguevara authored Mar 13, 2019
  
  56f3c2e9
12 Mar, 2019 12 commits
- added p_week in the EI config files (part 2) · 4ed9283d
  mguevara authored Mar 12, 2019
  
  4ed9283d
- added p_week in the EI config files (part 1) · b681e8fe
  mguevara authored Mar 12, 2019
  
  b681e8fe
- added p_week in the config files · 94e16a09
  mguevara authored Mar 12, 2019
  
  94e16a09
- Merge remote-tracking branch 'remotes/origin/master' into bsc_operationals · e966c891
  mguevara authored Mar 12, 2019
```
# Conflicts:
#	.gitignore
```
  e966c891
- Merge remote-tracking branch 'remotes/origin/master' into bsc_operationals · 331f61e0
  mguevara authored Mar 12, 2019
```
# Conflicts:
#	.gitignore
```
  331f61e0
- Added new preprocessor scripts for CAMS inventories · b1e78bfd
  Carles Tena authored Mar 12, 2019
  
  b1e78bfd
- Added PM and NMVOC split factors from CAMS-REG in the prepoc folder · 060f4919
  mguevara authored Mar 12, 2019
  
  060f4919
- Merge branch 'develop-12-daily-weekly-and-hourly-gridded-profiles' into 'master' · 7e7846c8
  Carles Tena authored Mar 12, 2019
```
Develop 12 daily weekly and hourly gridded profiles

See merge request !26
```
  7e7846c8
- Done · a41afbfc
  Carles Tena authored Mar 12, 2019
  
  a41afbfc
- modified erro message · 9e20a360
  Carles Tena authored Mar 12, 2019
  
  9e20a360
- Added check for gridded profile dimensions · 69a23c48
  Carles Tena authored Mar 12, 2019
  
  69a23c48
- fixed problem with GFAS point parallel runs · 2d24985f
  Carles Tena authored Mar 12, 2019
  
  2d24985f
11 Mar, 2019 1 commit
- fixed errors · b34296ec
  Carles Tena authored Mar 11, 2019
  
  b34296ec
07 Mar, 2019 3 commits
- Merge branch 'master' into 'develop-12-daily-weekly-and-hourly-gridded-profiles' · ba0085e2
  Carles Tena authored Mar 07, 2019
```
Master fixed

See merge request !25
```
  ba0085e2
- Master fixed · e07e0b0d
  Carles Tena authored Mar 07, 2019
  
  e07e0b0d
- REady to test · e8d2790c
  Carles Tena authored Mar 07, 2019
  
  e8d2790c
06 Mar, 2019 1 commit
- WIP · 3de4c3e5
  Carles Tena authored Mar 06, 2019
  
  3de4c3e5
05 Mar, 2019 6 commits
- Re-implementing temporal profiles · 65fbc82d
  Carles Tena authored Mar 05, 2019
  
  65fbc82d
- Same column ID name (before was different name for each profile type) · 5d4f4d9c
  Carles Tena authored Mar 05, 2019
  
  5d4f4d9c
- Changed version · 878c7e27
  Carles Tena authored Mar 05, 2019
  
  878c7e27
- Added 365 daily profile · 78e6b11a
  Carles Tena authored Mar 05, 2019
  
  78e6b11a
- Merge remote-tracking branch 'remotes/origin/develop-11-daily-to-weekly' · de71dc2f
  Carles Tena authored Mar 05, 2019
```
# Conflicts:
#	hermesv3_gr/modules/emision_inventories/emission_inventory.py
#	hermesv3_gr/modules/emision_inventories/point_gfas_emission_inventory.py

Merge done
```
  de71dc2f
- Merge branch '11-daily-to-weekly' into 'master' · c7f06b7b
  Carles Tena authored Mar 05, 2019
```
Resolve "Daily to weekly"

See merge request es/hermesv3_gr!23
```
  c7f06b7b
04 Mar, 2019 4 commits
- Changwe convention, dily profiles to weekly profiles · e4a88b00
  Carles Tena authored Mar 04, 2019
  
  e4a88b00
- Added CAMS_GLOB-ANTv21 emissions in reg .conf · 0c02c3ee
  mguevara authored Mar 04, 2019
  
  0c02c3ee
- Merge branch 'bsc_operationals' of https://earth.bsc.es/gitlab/es/hermesv3_gr into bsc_operationals · ed0bbce2
  mguevara authored Mar 04, 2019
  
  ed0bbce2
- Added speciation profiles for CAMS-GLOB_ANTv21 · dc03b4f0
  mguevara authored Mar 04, 2019
  
  dc03b4f0
01 Mar, 2019 8 commits
- Creoos table updated · ba878ea7
  Carles Tena authored Mar 01, 2019
  
  v1.0.0
  
  ba878ea7
- Merge remote-tracking branch 'origin/production' into production · 8b751fcd
  Carles Tena authored Mar 01, 2019
  
  8b751fcd
- README updated · 7a5f86c5
  Carles Tena authored Mar 01, 2019
  
  7a5f86c5
- Merge branch 'master' into 'production' · f25a3761
  Carles Tena authored Mar 01, 2019
```
version 1.0.0

See merge request es/hermesv3_gr!21
```
  f25a3761
- modified CHANGELOG for version 1.0.0 · 127a26f0
  Carles Tena authored Mar 01, 2019
  
  127a26f0
- Merge branch 'revert-970ac539' into 'production' · ea04b689
  Carles Tena authored Mar 01, 2019
```
Revert "Merge branch 'master' into 'production'"

See merge request es/hermesv3_gr!20
```
  ea04b689
- Revert "Merge branch 'master' into 'production'" · 88ff2064
  Carles Tena authored Mar 01, 2019
```
This reverts merge request !19
```
  88ff2064
- Merge branch 'master' into 'production' · 970ac539
  Carles Tena authored Mar 01, 2019
```
Master

See merge request !19
```
  970ac539
19 Feb, 2019 1 commit
- Changed vertical description to 48 CAMS layers · f0de1354
  mguevara authored Feb 19, 2019
  
  f0de1354
18 Feb, 2019 3 commits
- Merge branch 'bsc_operationals' of http://earth.bsc.es/gitlab/es/hermesv3_gr into bsc_operationals · 87b1476b
  mguevara authored Feb 18, 2019
  
  87b1476b
- added gitignore · 502af789
  mguevara authored Feb 18, 2019
  
  502af789
- Correcting PEP8 errors · 43c3f4a5
  Carles Tena authored Feb 18, 2019
  
  43c3f4a5