Skip to content

Commit

Permalink
removing the circular import of Variable.py from bgc_md2
Browse files Browse the repository at this point in the history
  • Loading branch information
@goujou
goujou committed Aug 4, 2020
1 parent e051063 commit 4deaef5
Show file tree
Hide file tree
Showing 2 changed files with 163 additions and 163 deletions.
138 changes: 69 additions & 69 deletions CompartmentalSystems/pwc_model_run_fd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .pwc_model_run import PWCModelRun
from .smooth_reservoir_model import SmoothReservoirModel
from .myOdeResult import solve_ivp_pwc
from bgc_md2.Variable import Variable
# from bgc_md2.Variable import Variable

###############################################################################

Expand Down Expand Up @@ -140,74 +140,74 @@ def acc_net_external_output_vector(self):
def fake_discretized_Bs(self, data_times=None):
return self.pwc_mr.fake_discretized_Bs(data_times)

def get_stock(self, mdo, pool_name, nr_layer=0, name=''):
ms = mdo.model_structure
pool_nr = ms.get_pool_nr(pool_name, nr_layer)
soln = self.solve()

if name == '':
name = ms.get_stock_var(pool_name)

return Variable(
name=name,
data=soln[:, pool_nr],
unit=mdo.stock_unit
)

def get_acc_gross_external_input_flux(self, mdo, pool_name, nr_layer=0, name=''):
ms = mdo.model_structure
pool_nr = ms.get_pool_nr(pool_name, nr_layer)

if name == '':
name = ms.get_external_input_flux_var(pool_name)

return Variable(
name=name,
data=self.acc_gross_external_input_vector()[:, pool_nr],
unit=mdo.stock_unit
)

def get_acc_gross_external_output_flux(self, mdo, pool_name, nr_layer=0, name=''):
ms = mdo.model_structure
pool_nr = ms.get_pool_nr(pool_name, nr_layer)

if name == '':
name = ms.get_external_output_flux_var(pool_name)

return Variable(
name=name,
data=self.acc_gross_external_output_vector()[:, pool_nr],
unit=mdo.stock_unit
)

def get_acc_gross_internal_flux(
self,
mdo,
pool_name_from,
pool_name_to,
nr_layer_from=0,
nr_layer_to=0,
name=''
):
ms = mdo.model_structure
pool_nr_from = ms.get_pool_nr(
pool_name_from,
nr_layer_from
)
pool_nr_to = ms.get_pool_nr(
pool_name_to,
nr_layer_to
)
Fs = self.acc_gross_internal_flux_matrix()

if name == '':
name = ms.get_horizontal_flux_var(pool_name_from, pool_name_to)

return Variable(
name=name,
data=Fs[:, pool_nr_to, pool_nr_from],
unit=mdo.stock_unit
)
# def get_stock(self, mdo, pool_name, nr_layer=0, name=''):
# ms = mdo.model_structure
# pool_nr = ms.get_pool_nr(pool_name, nr_layer)
# soln = self.solve()
#
# if name == '':
# name = ms.get_stock_var(pool_name)
#
# return Variable(
# name=name,
# data=soln[:, pool_nr],
# unit=mdo.stock_unit
# )
#
# def get_acc_gross_external_input_flux(self, mdo, pool_name, nr_layer=0, name=''):
# ms = mdo.model_structure
# pool_nr = ms.get_pool_nr(pool_name, nr_layer)
#
# if name == '':
# name = ms.get_external_input_flux_var(pool_name)
#
# return Variable(
# name=name,
# data=self.acc_gross_external_input_vector()[:, pool_nr],
# unit=mdo.stock_unit
# )
#
# def get_acc_gross_external_output_flux(self, mdo, pool_name, nr_layer=0, name=''):
# ms = mdo.model_structure
# pool_nr = ms.get_pool_nr(pool_name, nr_layer)
#
# if name == '':
# name = ms.get_external_output_flux_var(pool_name)
#
# return Variable(
# name=name,
# data=self.acc_gross_external_output_vector()[:, pool_nr],
# unit=mdo.stock_unit
# )
#
# def get_acc_gross_internal_flux(
# self,
# mdo,
# pool_name_from,
# pool_name_to,
# nr_layer_from=0,
# nr_layer_to=0,
# name=''
# ):
# ms = mdo.model_structure
# pool_nr_from = ms.get_pool_nr(
# pool_name_from,
# nr_layer_from
# )
# pool_nr_to = ms.get_pool_nr(
# pool_name_to,
# nr_layer_to
# )
# Fs = self.acc_gross_internal_flux_matrix()
#
# if name == '':
# name = ms.get_horizontal_flux_var(pool_name_from, pool_name_to)
#
# return Variable(
# name=name,
# data=Fs[:, pool_nr_to, pool_nr_from],
# unit=mdo.stock_unit
# )

# def to_netcdf(self, mdo, file_path):
# data_vars = {}
Expand Down
188 changes: 94 additions & 94 deletions tests/Test_pwc_model_run_fd.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,100 +92,100 @@ def test_reconstruction_accuracy(self):
)
)

def test_get_stock(self):
filename = 'cardamom_for_holger_10_ensembles.nc'
my_data_path = os.path.join(THIS_DIR, filename)
dataset = xr.open_dataset(my_data_path)
ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
mdo = load_mdo(ds)
mr = mdo.create_model_run()

soln = mr.solve()
for nr, pool_dict in enumerate(mdo.model_structure.pool_structure):
with self.subTest():
pool_name = pool_dict['pool_name']
self.assertTrue(
np.all(soln[:, nr] == mr.get_stock(mdo, pool_name).data)
)

def test_get_acc_gross_external_input_flux(self):
filename = 'cardamom_for_holger_10_ensembles.nc'
my_data_path = os.path.join(THIS_DIR, filename)
dataset = xr.open_dataset(my_data_path)
ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
mdo = load_mdo(ds)
mr = mdo.create_model_run()

ms = mdo.model_structure
Us = mr.acc_gross_external_input_vector()
for nr, pool_dict in enumerate(ms.pool_structure):
with self.subTest():
pool_name = pool_dict['pool_name']
if pool_name in ms.external_input_structure.keys():
self.assertTrue(
np.all(Us[:, nr] ==\
mr.get_acc_gross_external_input_flux(
mdo,
pool_name
).data
)
)
else:
self.assertTrue(np.all(Us[:, nr] == 0))

def test_get_acc_gross_external_output_flux(self):
filename = 'cardamom_for_holger_10_ensembles.nc'
my_data_path = os.path.join(THIS_DIR, filename)
dataset = xr.open_dataset(my_data_path)
ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
mdo = load_mdo(ds)
mr = mdo.create_model_run()

ms = mdo.model_structure
Rs = mr.acc_gross_external_output_vector()
for nr, pool_dict in enumerate(ms.pool_structure):
with self.subTest():
pool_name = pool_dict['pool_name']
if pool_name in ms.external_output_structure.keys():
self.assertTrue(
np.all(Rs[:, nr] ==\
mr.get_acc_gross_external_output_flux(
mdo,
pool_name
).data
)
)
else:
self.assertTrue(np.all(Rs[:, nr] == 0))

def test_get_acc_gross_internal_flux(self):
filename = 'cardamom_for_holger_10_ensembles.nc'
my_data_path = os.path.join(THIS_DIR, filename)
dataset = xr.open_dataset(my_data_path)
ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
mdo = load_mdo(ds)
mr = mdo.create_model_run()

ms = mdo.model_structure
Fs = mr.acc_gross_internal_flux_matrix()
for nr_from, pool_dict_from in enumerate(ms.pool_structure):
pool_name_from = pool_dict_from['pool_name']
for nr_to, pool_dict_to in enumerate(ms.pool_structure):
pool_name_to = pool_dict_to['pool_name']
with self.subTest():
if (pool_name_from, pool_name_to) in\
ms.horizontal_structure.keys():
self.assertTrue(
np.all(Fs[:, nr_to, nr_from] ==\
mr.get_acc_gross_internal_flux(
mdo,
pool_name_from,
pool_name_to
).data
)
)
else:
self.assertTrue(np.all(Fs[:, nr_to, nr_from] == 0))
# def test_get_stock(self):
# filename = 'cardamom_for_holger_10_ensembles.nc'
# my_data_path = os.path.join(THIS_DIR, filename)
# dataset = xr.open_dataset(my_data_path)
# ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
# mdo = load_mdo(ds)
# mr = mdo.create_model_run()
#
# soln = mr.solve()
# for nr, pool_dict in enumerate(mdo.model_structure.pool_structure):
# with self.subTest():
# pool_name = pool_dict['pool_name']
# self.assertTrue(
# np.all(soln[:, nr] == mr.get_stock(mdo, pool_name).data)
# )
#
# def test_get_acc_gross_external_input_flux(self):
# filename = 'cardamom_for_holger_10_ensembles.nc'
# my_data_path = os.path.join(THIS_DIR, filename)
# dataset = xr.open_dataset(my_data_path)
# ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
# mdo = load_mdo(ds)
# mr = mdo.create_model_run()
#
# ms = mdo.model_structure
# Us = mr.acc_gross_external_input_vector()
# for nr, pool_dict in enumerate(ms.pool_structure):
# with self.subTest():
# pool_name = pool_dict['pool_name']
# if pool_name in ms.external_input_structure.keys():
# self.assertTrue(
# np.all(Us[:, nr] ==\
# mr.get_acc_gross_external_input_flux(
# mdo,
# pool_name
# ).data
# )
# )
# else:
# self.assertTrue(np.all(Us[:, nr] == 0))
#
# def test_get_acc_gross_external_output_flux(self):
# filename = 'cardamom_for_holger_10_ensembles.nc'
# my_data_path = os.path.join(THIS_DIR, filename)
# dataset = xr.open_dataset(my_data_path)
# ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
# mdo = load_mdo(ds)
# mr = mdo.create_model_run()
#
# ms = mdo.model_structure
# Rs = mr.acc_gross_external_output_vector()
# for nr, pool_dict in enumerate(ms.pool_structure):
# with self.subTest():
# pool_name = pool_dict['pool_name']
# if pool_name in ms.external_output_structure.keys():
# self.assertTrue(
# np.all(Rs[:, nr] ==\
# mr.get_acc_gross_external_output_flux(
# mdo,
# pool_name
# ).data
# )
# )
# else:
# self.assertTrue(np.all(Rs[:, nr] == 0))
#
# def test_get_acc_gross_internal_flux(self):
# filename = 'cardamom_for_holger_10_ensembles.nc'
# my_data_path = os.path.join(THIS_DIR, filename)
# dataset = xr.open_dataset(my_data_path)
# ds = dataset.isel(ens=0, lat=0, lon=0, time=slice(None, 24))
# mdo = load_mdo(ds)
# mr = mdo.create_model_run()
#
# ms = mdo.model_structure
# Fs = mr.acc_gross_internal_flux_matrix()
# for nr_from, pool_dict_from in enumerate(ms.pool_structure):
# pool_name_from = pool_dict_from['pool_name']
# for nr_to, pool_dict_to in enumerate(ms.pool_structure):
# pool_name_to = pool_dict_to['pool_name']
# with self.subTest():
# if (pool_name_from, pool_name_to) in\
# ms.horizontal_structure.keys():
# self.assertTrue(
# np.all(Fs[:, nr_to, nr_from] ==\
# mr.get_acc_gross_internal_flux(
# mdo,
# pool_name_from,
# pool_name_to
# ).data
# )
# )
# else:
# self.assertTrue(np.all(Fs[:, nr_to, nr_from] == 0))

###############################################################################

Expand Down

0 comments on commit 4deaef5

Please sign in to comment.