From 0c98b8ce38db6702aff65ae42cbb518390e8c47d Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Tue, 12 Mar 2019 15:49:11 +0100 Subject: [PATCH 1/4] Modified citation --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 4aa2182..b28df6f 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,7 @@ HERMESv3_GR is distributed free of charge under the licence [GNU GPL v3.0](https ## Citing -Guevara, M., Tena, C., Porquet, M., Jorba, O., Pérez García-Pando, C., 2018. HERMESv3_GR: A stand-alone multiscale emission processing system. Extended abstract of the 17th Annual CMAS Conference, Chapell Hill, NC, October 22-24. - +Guevara, M., Tena, C., Porquet, M., Jorba, O., and Pérez García-Pando, C.: HERMESv3, a stand-alone multiscale atmospheric emission modelling framework – Part 1: global and regional module, Geosci. Model Dev. Discuss., https://doi.org/10.5194/gmd-2018-324, in review, 2019. ## Support Due to our limited time and resources, the developing team can not guarantee a regular support. Nevertheless, we will be happy to provide advice for new users. -- GitLab From 23020a939cb4ece71a11b604115922aa80cb8a39 Mon Sep 17 00:00:00 2001 From: Carles Tena Date: Tue, 12 Mar 2019 15:51:08 +0100 Subject: [PATCH 2/4] Modified citation --- CHANGELOG | 20 +++++++++----------- README.md | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0ac4d42..e7abef4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,14 +1,3 @@ -0.0.0 - 2018/09/18 - - HERMESv3_GR beta version first release - -1.0.0 - 2019/03/01 - - HEMRESv3_GR stable version - GFAS emission inventory as point source emission. - 1.0.1 2019/03/12 @@ -20,4 +9,13 @@ Fixed bug on hourly profile Added new preprocs +1.0.0 + 2019/03/01 + + HEMRESv3_GR stable version + GFAS emission inventory as point source emission. + +0.0.0 + 2018/09/18 + HERMESv3_GR beta version first release diff --git a/README.md b/README.md index b28df6f..039830f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ HERMESv3_GR is distributed free of charge under the licence [GNU GPL v3.0](https ## Citing -Guevara, M., Tena, C., Porquet, M., Jorba, O., and Pérez García-Pando, C.: HERMESv3, a stand-alone multiscale atmospheric emission modelling framework – Part 1: global and regional module, Geosci. Model Dev. Discuss., https://doi.org/10.5194/gmd-2018-324, in review, 2019. +Guevara, M., Tena, C., Porquet, M., Jorba, O., and Pérez García-Pando, C.: HERMESv3, a stand-alone multiscale atmospheric emission modelling framework – Part 1: global and regional module, Geosci. Model Dev. Discuss., https://doi.org/10.5194/gmd-2018-324, in review, 2019. ## Support Due to our limited time and resources, the developing team can not guarantee a regular support. Nevertheless, we will be happy to provide advice for new users. -- GitLab From 8208a6ceb5544bd77236c601ceeff13e0b6fa25d Mon Sep 17 00:00:00 2001 From: ctena Date: Wed, 13 Mar 2019 18:21:22 +0100 Subject: [PATCH 3/4] Added barrier when writing the grid shapefile to make sure that all the process have their own grid shapefile. --- hermesv3_gr/modules/grids/grid.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hermesv3_gr/modules/grids/grid.py b/hermesv3_gr/modules/grids/grid.py index 9263e64..f090e7e 100644 --- a/hermesv3_gr/modules/grids/grid.py +++ b/hermesv3_gr/modules/grids/grid.py @@ -531,6 +531,7 @@ class Grid(object): settings.write_log('\t\tGrid shapefile already done. Lets try to read it.', level=3) gdf = gpd.read_file(self.shapefile_path) + settings.comm.Barrier() settings.write_time('Grid', 'to_shapefile', timeit.default_timer() - st_time, level=1) return gdf -- GitLab From b226bbd9ef7a38feb51412fe3ca969dda25c3e34 Mon Sep 17 00:00:00 2001 From: ctena Date: Wed, 13 Mar 2019 18:24:44 +0100 Subject: [PATCH 4/4] Added barrier when creating shapefile folder --- hermesv3_gr/modules/grids/grid.py | 1 + 1 file changed, 1 insertion(+) diff --git a/hermesv3_gr/modules/grids/grid.py b/hermesv3_gr/modules/grids/grid.py index f090e7e..2669dd1 100644 --- a/hermesv3_gr/modules/grids/grid.py +++ b/hermesv3_gr/modules/grids/grid.py @@ -411,6 +411,7 @@ class Grid(object): if settings.rank == 0: if not os.path.exists(self.shapefile_path): os.makedirs(self.shapefile_path) + settings.comm.Barrier() if full_grid: self.shapefile_path = os.path.join(self.shapefile_path, 'grid_shapefile.shp') else: -- GitLab