Compare commits

..
Author SHA1 Message Date
Pierre-Antoine Rouby 34c9fbd77a pamhyr: Some hot fixes... 2024-01-30 16:23:00 +01:00
Pierre-Antoine Rouby f4ca2650e5 Some hot fix. 2024-01-30 13:04:53 +01:00
Pierre-Antoine Rouby 1d0aded01d HS: input_pk hot fix. 2024-01-30 10:32:50 +01:00
5 changed files with 23 additions and 10 deletions

No files matched your search

+2
View File
@@ -287,12 +287,14 @@ class MeshingWithMageMailleurTT(AMeshingTool):
return reach return reach
with tempfile.TemporaryDirectory() as tmp: with tempfile.TemporaryDirectory() as tmp:
logger.debug(f"temp file: {tmp}")
st_file = self.export_reach_to_st(reach, tmp) st_file = self.export_reach_to_st(reach, tmp)
m_file = st_file.rsplit(".ST", 1)[0] + ".M" m_file = st_file.rsplit(".ST", 1)[0] + ".M"
proc = QProcess() proc = QProcess()
proc.setWorkingDirectory(tmp) proc.setWorkingDirectory(tmp)
logger.debug(f"! mailleurTT {st_file} {m_file} {str(step)}")
proc.start( proc.start(
self._exe_path(), [st_file, m_file, str(step)] self._exe_path(), [st_file, m_file, str(step)]
) )
@@ -200,7 +200,10 @@ class HydraulicStructure(SQLSubModel):
@input_kp.setter @input_kp.setter
def input_kp(self, input_kp): def input_kp(self, input_kp):
self._input_kp = float(input_kp) if input_kp is not None:
input_kp = float(input_kp)
self._input_kp = input_kp
self._status.modified() self._status.modified()
@property @property
+5 -2
View File
@@ -507,6 +507,8 @@ class Mage(CommandLineSolver):
name = bhs.name name = bhs.name
if name == "": if name == "":
name = f"HS_{bhs.id:>3}".replace(" ", "0") name = f"HS_{bhs.id:>3}".replace(" ", "0")
else:
name = name.replace(" ", "_")
f.write( f.write(
f"{sin_dict[bhs._type]} " + f"{sin_dict[bhs._type]} " +
@@ -1198,9 +1200,10 @@ class Mage8(Mage):
logger.info(f"read_gra: ... end with {len(ts)} timestamp read") logger.info(f"read_gra: ... end with {len(ts)} timestamp read")
@timer @timer
def results(self, study, repertory, qlog=None): def results(self, study, repertory, qlog=None, name=None):
self._study = study self._study = study
name = study.name.replace(" ", "_") if name is None:
name = study.name.replace(" ", "_")
results = super(Mage8, self).results(study, repertory, qlog, name=name) results = super(Mage8, self).results(study, repertory, qlog, name=name)
self.read_gra(study, repertory, results, qlog, name=name) self.read_gra(study, repertory, results, qlog, name=name)
+6 -6
View File
@@ -530,16 +530,16 @@ class GeometryWindow(PamhyrWindow):
def _undo(self): def _undo(self):
self._table.undo() self._table.undo()
self.select_current_profile() self.select_current_profile()
self.update_plot_ac() # self.update_plot_ac()
self.update_plot_xy() # self.update_plot_xy()
self.update_plot_kpc() # self.update_plot_kpc()
def _redo(self): def _redo(self):
self._table.redo() self._table.redo()
self.select_current_profile() self.select_current_profile()
self.update_plot_ac() # self.update_plot_ac()
self.update_plot_xy() # self.update_plot_xy()
self.update_plot_kpc() # self.update_plot_kpc()
def export_to_file(self): def export_to_file(self):
settings = QSettings( settings = QSettings(
+6 -1
View File
@@ -843,15 +843,19 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if self._last_results is None: if self._last_results is None:
results = solver.results( results = solver.results(
self._study, self._study,
self._solver_workdir(solver) self._solver_workdir(solver),
) )
# Open from file # Open from file
if type(results) is str: if type(results) is str:
logger.info(f"Open results from {os.path.dirname(results)}") logger.info(f"Open results from {os.path.dirname(results)}")
name = os.path.basename(results).replace(".BIN", "")
results = solver.results( results = solver.results(
self._study, self._study,
os.path.dirname(results), os.path.dirname(results),
name=name
) )
# No results available # No results available
@@ -918,6 +922,7 @@ class ApplicationWindow(QMainWindow, ListedSubWindow, WindowToolKit):
if dialog.exec_(): if dialog.exec_():
file_name = dialog.selectedFiles() file_name = dialog.selectedFiles()
logger.info(f"Select results: {file_name}")
self.open_solver_results( self.open_solver_results(
self._last_solver, self._last_solver,
results=file_name[0] results=file_name[0]