mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Compare commits
2
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
0946212c4b | ||
|
|
d6ab44d18e |
No files matched your search
@@ -48,7 +48,7 @@ copy /y ..\mage8-windows\libbief.dll pamhyr\mage8\
|
||||
|
||||
rem rubar
|
||||
mkdir pamhyr\rubar
|
||||
copy /y ..\adists-windows\rubarbe.exe pamhyr\rubar\
|
||||
copy /y ..\rubar-windows\rubarbe.exe pamhyr\rubar\
|
||||
|
||||
rem adists
|
||||
mkdir pamhyr\adists
|
||||
|
||||
@@ -320,7 +320,8 @@ class Pollutants(SQLSubModel):
|
||||
bc=float(data[8]),
|
||||
pollutant=self,
|
||||
status=self._status
|
||||
)]
|
||||
)
|
||||
]
|
||||
|
||||
@classmethod
|
||||
def _db_create(cls, execute, ext=""):
|
||||
|
||||
@@ -170,7 +170,7 @@ class Rubar3(CommandLineSolver):
|
||||
it = iter(params)
|
||||
|
||||
param = next(it, None)
|
||||
while param != None:
|
||||
while param is not None:
|
||||
name = param.name
|
||||
value = param.value
|
||||
|
||||
|
||||
@@ -266,7 +266,6 @@ class MainTranslate(UnitTranslate):
|
||||
"incompatible study version"
|
||||
)
|
||||
|
||||
|
||||
self._dict["mb_unsaved_study_title"] = _translate(
|
||||
"MainWindow", "Open scenarios window"
|
||||
)
|
||||
|
||||
+2
-2
@@ -363,8 +363,8 @@ class Config(SQL):
|
||||
# Rubar3
|
||||
ctor = solver_type_list["rubar3"]
|
||||
new = ctor("default-Rubar3")
|
||||
new._description = "Default Pamhyr2 Rubar 3 version"
|
||||
new._cmd_solver = f""""@install_dir/rubar/rubar3{ext}" @args @input"""
|
||||
new._description = "Default Pamhyr2 RubarBE version"
|
||||
new._cmd_solver = f""""@install_dir/rubar/rubarbe{ext}" @args @input"""
|
||||
self._solvers.append(new)
|
||||
|
||||
# Mage fake 7
|
||||
|
||||
Reference in new issue
Block a user