diff --git a/pydynamo/__init__.py b/pydynamo/__init__.py index 4889f5beb648ab85a90e2e3cb85d4592f54ba66e..13a285472cbe6e685613b0a42d5a547646402890 100644 --- a/pydynamo/__init__.py +++ b/pydynamo/__init__.py @@ -7,4 +7,4 @@ from pydynamo.core import psdsystem from pydynamo.core.dynamo_converter import convert_dynamo_file from .world3 import World3 - +import pydynamo.world3 diff --git a/pydynamo/world3/__init__.py b/pydynamo/world3/__init__.py index b43fec96541c778bc8c5216976319a4bb71d432b..72401373b1d3a7c0a083da381c014e7c4487a5f2 100644 --- a/pydynamo/world3/__init__.py +++ b/pydynamo/world3/__init__.py @@ -7,27 +7,4 @@ from .plot_utils import plot_world_with_scales, plot_world_03 from .scenarios_limits_to_growth import scenarios from .world3_class import World3 -""" -code_file = 'world3/code/limits_to_growth_pydynamo_code.py' -code_file_72 = 'world3/code/limits_to_growth_pydynamo_code_72.py' - -# Get every informations - -sector_vars = {sector: [] for sector in var_sector.values()} -for var in var_sector: - sector_vars[var_sector[var]].append(var) -var_color = {v: sector_color[sector] for v, sector in var_sector.items()} - -translated_defs = get_definitions.read_translated_defs('world3/infos/translated_defs.md') -definitions = {v: d[0] for v, d in translated_defs.items()} - -def get_w3(): - s = dno.parse_system.system_from_file(code_file) - s.add_comments(definitions) - return s - -def get_w3_72(): - s = dno.parse_system.system_from_file(code_file_72) - s.add_comments(definitions) - return s -""" +import pydynamo.world3.data_world3