Model: Move Model.DB into Model.Tools.PamhyrDB.

src/Model/BoundaryCondition/BoundaryCondition.py

@@ -20,7 +20,7 @@ import logging
 
 from tools import trace, timer, old_pamhyr_date_to_timestamp
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()

src/Model/BoundaryCondition/BoundaryConditionList.py

@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelListWithTab
 from Model.Except import NotImplementedMethodeError
 

src/Model/Friction/Friction.py

@@ -18,7 +18,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Friction(SQLSubModel):
     def __init__(self, name:str = "", status = None):

src/Model/Friction/FrictionList.py

@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelList
 
 from Model.Friction.Friction import Friction

src/Model/Geometry/PointXYZ.py

@@ -19,7 +19,7 @@
 from math import dist
 import numpy as np
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Geometry.Point import Point
 
 class PointXYZ(Point, SQLSubModel):

src/Model/Geometry/ProfileXYZ.py

@@ -21,7 +21,7 @@ from typing import List
 
 from tools import timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import ClipboardFormatError
 from Model.Geometry.Profile import Profile
 from Model.Geometry.PointXYZ import PointXYZ

src/Model/Geometry/Reach.py

@@ -27,7 +27,7 @@ from functools import reduce
 
 from tools import flatten, timer, trace
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 from Model.Geometry.Profile import Profile
 from Model.Geometry.ProfileXYZ import ProfileXYZ

src/Model/InitialConditions/InitialConditions.py

@@ -20,7 +20,7 @@ from copy import copy, deepcopy
 from tools import trace, timer
 from functools import reduce
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Data(SQLSubModel):
     def __init__(self, name:str = "",

src/Model/InitialConditions/InitialConditionsDict.py

@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrDict import PamhyrModelDict
 from Model.InitialConditions.InitialConditions import InitialConditions
 

src/Model/LateralContribution/LateralContribution.py

@@ -20,7 +20,7 @@ import logging
 
 from tools import trace, timer, old_pamhyr_date_to_timestamp
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()

src/Model/LateralContribution/LateralContributionList.py

@@ -19,7 +19,6 @@
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Tools.PamhyrList import PamhyrModelListWithTab
 from Model.Except import NotImplementedMethodeError
 

src/Model/River.py

@@ -18,7 +18,7 @@
 
 from tools import flatten
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 from Model.Network.Node import Node
 from Model.Network.Edge import Edge

src/Model/SedimentLayer/SedimentLayer.py

@@ -2,7 +2,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 
 class Layer(SQLSubModel):

src/Model/SedimentLayer/SedimentLayerList.py

@@ -2,7 +2,6 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Except import NotImplementedMethodeError
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.SedimentLayer.SedimentLayer import SedimentLayer

src/Model/SolverParameters/SolverParametersList.py

@@ -21,7 +21,6 @@ from tools import trace, timer
 from Solver.Solvers import solver_type_list
 
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.DB import SQLSubModel
 
 class Parameter():
     def __init__(self,
@@ -105,7 +104,7 @@ class SolverParametersList(PamhyrModelList):
                 solvers = execute("SELECT DISTINCT solver FROM solver_parameter")
 
                 for solver in solvers:
-                    if solver is not "mage8":
+                    if solver != "mage8":
                         continue
 
                     data = execute("SELECT ind, name, value " +

src/Model/Stricklers/Stricklers.py

@@ -18,7 +18,7 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 class Stricklers(SQLSubModel):
     _id_cnt = 0

src/Model/Stricklers/StricklersList.py

@@ -18,7 +18,6 @@
 
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
 from Model.Saved import SavedStatus
 from Model.Tools.PamhyrList import PamhyrModelList
 from Model.Stricklers.Stricklers import Stricklers

src/Model/Study.py

@@ -23,7 +23,7 @@ from datetime import datetime
 
 from tools import timer, timestamp
 
-from Model.DB import SQLModel
+from Model.Tools.PamhyrDB import SQLModel
 from Model.Saved import SavedStatus
 from Model.Serializable import Serializable
 from Model.Except import NotImplementedMethodeError

src/Model/Tools/PamhyrDB.py

@@ -1,4 +1,4 @@
-# DB.py -- Pamhyr abstract model database classes
+# PamhyrDB.py -- Pamhyr abstract model database classes
 # Copyright (C) 2023  INRAE
 #
 # This program is free software: you can redistribute it and/or modify

src/Model/Tools/PamhyrDict.py

@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 logger = logging.getLogger()
 

src/Model/Tools/PamhyrList.py

@@ -21,7 +21,7 @@ import logging
 from copy import copy
 from tools import trace, timer
 
-from Model.DB import SQLSubModel
+from Model.Tools.PamhyrDB import SQLSubModel
 
 logger = logging.getLogger()