mirror of https://gitlab.com/pamhyr/pamhyr2
BC, LC: Fix convert exceptions.
parent
9ecd9a8f2a
commit
0835900aad
|
|
@ -16,11 +16,15 @@
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
from tools import trace, timer, old_pamhyr_date_to_timestamp
|
from tools import trace, timer, old_pamhyr_date_to_timestamp
|
||||||
|
|
||||||
from Model.DB import SQLSubModel
|
from Model.DB import SQLSubModel
|
||||||
from Model.Except import NotImplementedMethodeError
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
class BoundaryCondition(SQLSubModel):
|
class BoundaryCondition(SQLSubModel):
|
||||||
_sub_classes = []
|
_sub_classes = []
|
||||||
_id_cnt = 0
|
_id_cnt = 0
|
||||||
|
|
@ -317,14 +321,17 @@ class BoundaryCondition(SQLSubModel):
|
||||||
new = cls(name = self.name, status = self._status)
|
new = cls(name = self.name, status = self._status)
|
||||||
new.node = self.node
|
new.node = self.node
|
||||||
|
|
||||||
for i, _ in self.data:
|
for i, _ in enumerate(self.data):
|
||||||
new.add(i)
|
new.add(i)
|
||||||
|
|
||||||
for i in [0,1]:
|
for i in [0,1]:
|
||||||
for j in [0,1]:
|
for j in [0,1]:
|
||||||
if self._header[i] == new.header[j]:
|
if self._header[i] == new.header[j]:
|
||||||
for ind, v in self.data:
|
for ind, v in self.data:
|
||||||
|
try:
|
||||||
new._set_i_c_v(ind, j, v[i])
|
new._set_i_c_v(ind, j, v[i])
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
|
||||||
return new
|
return new
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,11 +16,15 @@
|
||||||
|
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
import logging
|
||||||
|
|
||||||
from tools import trace, timer, old_pamhyr_date_to_timestamp
|
from tools import trace, timer, old_pamhyr_date_to_timestamp
|
||||||
|
|
||||||
from Model.DB import SQLSubModel
|
from Model.DB import SQLSubModel
|
||||||
from Model.Except import NotImplementedMethodeError
|
from Model.Except import NotImplementedMethodeError
|
||||||
|
|
||||||
|
logger = logging.getLogger()
|
||||||
|
|
||||||
class LateralContribution(SQLSubModel):
|
class LateralContribution(SQLSubModel):
|
||||||
_sub_classes = []
|
_sub_classes = []
|
||||||
_id_cnt = 0
|
_id_cnt = 0
|
||||||
|
|
@ -358,14 +362,17 @@ class LateralContribution(SQLSubModel):
|
||||||
new.begin_kp = self.begin_kp
|
new.begin_kp = self.begin_kp
|
||||||
new.end_kp = self.end_kp
|
new.end_kp = self.end_kp
|
||||||
|
|
||||||
for i, _ in self.data:
|
for i, _ in enumerate(self.data):
|
||||||
new.add(i)
|
new.add(i)
|
||||||
|
|
||||||
for i in [0,1]:
|
for i in [0,1]:
|
||||||
for j in [0,1]:
|
for j in [0,1]:
|
||||||
if self._header[i] == new.header[j]:
|
if self._header[i] == new.header[j]:
|
||||||
for ind, v in self.data:
|
for ind, v in self.data:
|
||||||
|
try:
|
||||||
new._set_i_c_v(ind, j, v[i])
|
new._set_i_c_v(ind, j, v[i])
|
||||||
|
except Exception as e:
|
||||||
|
logger.info(e)
|
||||||
|
|
||||||
self._status.modified()
|
self._status.modified()
|
||||||
return new
|
return new
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue