diff --git a/CHANGELOG b/CHANGELOG index 222e0e1ed78ce0888289dabe782f2900a4711032..9c99603d2e1389eeccd8614868098f9d29fdee90 100755 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,5 @@ -0.0.0 - 2019/XX/XX +0.1.1 + 2019/10/29 First beta version: @@ -26,9 +26,11 @@ 9. Point sources sector 10. Road traffic sector 11. Traffic area (evaporative & small cities) sector + 12. Solvents sector - Writing options: + 0. Return emissions on memory 1. Default writer 2. CMAQ writer 3. MONARCH writer - 4. WRF-Chem writer \ No newline at end of file + 4. WRF-Chem writer diff --git a/hermesv3_bu/__init__.py b/hermesv3_bu/__init__.py index 3dc1f76bc69e3f559bee6253b24fc93acee9e1f9..485f44ac21b2ee78a2ee1ed0ea584114a1c957c3 100755 --- a/hermesv3_bu/__init__.py +++ b/hermesv3_bu/__init__.py @@ -1 +1 @@ -__version__ = "0.1.0" +__version__ = "0.1.1" diff --git a/hermesv3_bu/hermes.py b/hermesv3_bu/hermes.py index 7b678df1f1260183ddb5ceba381e09f80f625485..ff055d6873e08528b73937ba54781d665812bec3 100755 --- a/hermesv3_bu/hermes.py +++ b/hermesv3_bu/hermes.py @@ -48,11 +48,11 @@ class Hermes(object): self.sector_manager = SectorManager( self.comm, self.logger, self.grid, self.clip, self.date_array, self.arguments) - self.writer = select_writer(self.logger, self.arguments, self.grid, self.date_array) + self.writer = select_writer(self.logger, self.comm, self.arguments, self.grid, self.date_array) self.logger.write_time_log('HERMES', '__init__', timeit.default_timer() - self.initial_time) - def main(self): + def main(self, return_emis=False): """ Main functionality of the model. """ @@ -62,6 +62,8 @@ class Hermes(object): self.logger.write_log('***** HERMESv3_BU First Time finished successfully *****') else: emis = self.sector_manager.run() + if return_emis: + return emis waiting_time = timeit.default_timer() self.comm.Barrier() self.logger.write_log('All emissions calculated!') @@ -80,8 +82,8 @@ class Hermes(object): return None -def run(comm=None): - date = Hermes(Config(comm), comm).main() +def run(): + date = Hermes(Config()).main() while date is not None: date = Hermes(Config(new_date=date)).main() sys.exit(0) diff --git a/hermesv3_bu/writer/writer.py b/hermesv3_bu/writer/writer.py index 3d5d284d78a20491e3b0fefe56fa3cd01fe03c59..0a92322b392c2c7906313218d4951cd46fc77242 100755 --- a/hermesv3_bu/writer/writer.py +++ b/hermesv3_bu/writer/writer.py @@ -15,7 +15,7 @@ BALANCED = False MPI_TAG_CONSTANT = 10**6 -def select_writer(logger, arguments, grid, date_array): +def select_writer(logger, comm_world, arguments, grid, date_array): """ Select the writer depending on the arguments passed to HERMESv3_BU @@ -35,7 +35,6 @@ def select_writer(logger, arguments, grid, date_array): :rtype: Writer """ spent_time = timeit.default_timer() - comm_world = MPI.COMM_WORLD if grid.shape[2] % 2 == 0: max_procs = grid.shape[2] // 2