kp to rk

src/Model/D90AdisTS/D90AdisTSSpec.py

@@ -43,8 +43,8 @@ class D90AdisTSSpec(SQLSubModel):
 
         self._name_section = name
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._d90 = None
         self._enabled = True
 
@@ -58,8 +58,8 @@ class D90AdisTSSpec(SQLSubModel):
                 d90_default INTEGER NOT NULL,
                 name TEXT NOT NULL,
                 reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
+                start_rk REAL NOT NULL,
+                end_rk REAL NOT NULL,
                 d90 REAL NOT NULL,
                 enabled BOOLEAN NOT NULL,
                 FOREIGN KEY(d90_default) REFERENCES d90_adists(id),
@@ -83,7 +83,7 @@ class D90AdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, d90_default, name, reach, start_kp, end_kp, " +
+            "SELECT id, d90_default, name, reach, start_rk, end_rk, " +
             "d90, enabled " +
             "FROM d90_spec " +
             f"WHERE d90_default = {data['d90_default_id']} "
@@ -93,8 +93,8 @@ class D90AdisTSSpec(SQLSubModel):
             id            = row[0]
             name          = row[2]
             reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
+            start_rk      = row[4]
+            end_rk        = row[5]
             d90 = row[6]
             enabled       = (row[7] == 1)
 
@@ -105,8 +105,8 @@ class D90AdisTSSpec(SQLSubModel):
             )
 
             new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
+            new_spec.start_rk = start_rk
+            new_spec.end_rk = end_rk
             new_spec.d90 = d90
             new_spec.enabled = enabled
 
@@ -120,14 +120,14 @@ class D90AdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "d90_spec(id, d90_default, name, reach, " +
-            "start_kp, end_kp, d90, enabled) " +
+            "start_rk, end_rk, d90, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{d90_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._d90}, " +
             f"{self._enabled}" +
             ")"
@@ -155,21 +155,21 @@ class D90AdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property

src/Model/DIFAdisTS/DIFAdisTSSpec.py

@@ -43,8 +43,8 @@ class DIFAdisTSSpec(SQLSubModel):
 
         self._method = method
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._dif = None
         self._b = None
         self._c = None
@@ -60,8 +60,8 @@ class DIFAdisTSSpec(SQLSubModel):
                 dif_default INTEGER NOT NULL,
                 method TEXT NOT NULL,
                 reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
+                start_rk REAL NOT NULL,
+                end_rk REAL NOT NULL,
                 dif REAL NOT NULL,
                 b REAL,
                 c REAL,
@@ -87,7 +87,7 @@ class DIFAdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, dif_default, method, reach, start_kp, end_kp, " +
+            "SELECT id, dif_default, method, reach, start_rk, end_rk, " +
             "dif, b, c, enabled " +
             "FROM dif_spec " +
             f"WHERE dif_default = {data['dif_default_id']} "
@@ -97,8 +97,8 @@ class DIFAdisTSSpec(SQLSubModel):
             id            = row[0]
             method          = row[2]
             reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
+            start_rk      = row[4]
+            end_rk        = row[5]
             dif = row[6]
             b = row[7]
             c = row[8]
@@ -111,8 +111,8 @@ class DIFAdisTSSpec(SQLSubModel):
             )
 
             new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
+            new_spec.start_rk = start_rk
+            new_spec.end_rk = end_rk
             new_spec.dif = dif
             new_spec.b = b
             new_spec.c = c
@@ -128,14 +128,14 @@ class DIFAdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "dif_spec(id, dif_default, method, reach, " +
-            "start_kp, end_kp, dif, b, c, enabled) " +
+            "start_rk, end_rk, dif, b, c, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{dif_default}, " +
             f"'{self._db_format(self._method)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._dif}, " +
             f"{self._b}, " +
             f"{self._c}, " +
@@ -165,21 +165,21 @@ class DIFAdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property

src/Model/Friction/Friction.py

@@ -75,8 +75,8 @@ class Friction(SQLSubModel):
         if major == minor == "0":
             if int(release) < 11:
                 execute("ALTER TABLE friction " +
-                        "RENAME COLUMN begin_kp TO begin_rk")
-                execute("ALTER TABLE friction RENAME COLUMN end_kp TO end_rk")
+                        "RENAME COLUMN begin_rk TO begin_rk")
+                execute("ALTER TABLE friction RENAME COLUMN end_rk TO end_rk")
 
         return True
 

src/Model/Geometry/ProfileXYZ.py

@@ -108,7 +108,7 @@ class ProfileXYZ(Profile, SQLSubModel):
                 execute(
                     """
                     ALTER TABLE geometry_profileXYZ
-                    RENAME COLUMN kp TO rk
+                    RENAME COLUMN rk TO rk
                     """
                 )
 

src/Model/HydraulicStructures/HydraulicStructures.py

@@ -94,13 +94,13 @@ class HydraulicStructure(SQLSubModel):
                 execute(
                     """
                     ALTER TABLE hydraulic_structures
-                    RENAME COLUMN input_kp TO input_rk
+                    RENAME COLUMN input_rk TO input_rk
                     """
                 )
                 execute(
                     """
                     ALTER TABLE hydraulic_structures
-                    RENAME COLUMN output_kp TO output_rk
+                    RENAME COLUMN output_rk TO output_rk
                     """
                 )
 

src/Model/InitialConditions/InitialConditions.py

@@ -80,7 +80,7 @@ class Data(SQLSubModel):
         if major == minor == "0":
             if int(release) < 11:
                 execute(
-                    "ALTER TABLE initial_conditions RENAME COLUMN kp TO rk"
+                    "ALTER TABLE initial_conditions RENAME COLUMN rk TO rk"
                 )
 
         return cls._update_submodel(execute, version)

src/Model/InitialConditionsAdisTS/InitialConditionsAdisTSSpec.py

@@ -43,8 +43,8 @@ class ICAdisTSSpec(SQLSubModel):
 
         self._name_section = name
         self._reach = None
-        self._start_kp = None
-        self._end_kp = None
+        self._start_rk = None
+        self._end_rk = None
         self._concentration = None
         self._eg = None
         self._em = None
@@ -62,8 +62,8 @@ class ICAdisTSSpec(SQLSubModel):
                 ic_default INTEGER NOT NULL,
                 name TEXT NOT NULL,
                 reach INTEGER NOT NULL,
-                start_kp REAL NOT NULL,
-                end_kp REAL NOT NULL,
+                start_rk REAL NOT NULL,
+                end_rk REAL NOT NULL,
                 concentration REAL NOT NULL,
                 eg REAL NOT NULL,
                 em REAL NOT NULL,
@@ -91,7 +91,7 @@ class ICAdisTSSpec(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, ic_default, name, reach, start_kp, end_kp, " +
+            "SELECT id, ic_default, name, reach, start_rk, end_rk, " +
             "concentration, eg, em, ed, rate, enabled " +
             "FROM initial_conditions_spec " +
             f"WHERE ic_default = {data['ic_default_id']} "
@@ -101,8 +101,8 @@ class ICAdisTSSpec(SQLSubModel):
             id            = row[0]
             name          = row[2]
             reach         = row[3]
-            start_kp      = row[4]
-            end_kp        = row[5]
+            start_rk      = row[4]
+            end_rk        = row[5]
             concentration = row[6]
             eg            = row[7]
             em            = row[8]
@@ -110,7 +110,7 @@ class ICAdisTSSpec(SQLSubModel):
             rate          = row[10]
             enabled       = (row[11] == 1)
 
-            #new_spec = [name, reach, start_kp, end_kp, concentration, eg, em, ed, rate, enabled]
+            #new_spec = [name, reach, start_rk, end_rk, concentration, eg, em, ed, rate, enabled]
 
             new_spec = cls(
                 id=id,
@@ -119,8 +119,8 @@ class ICAdisTSSpec(SQLSubModel):
             )
 
             new_spec.reach = reach
-            new_spec.start_kp = start_kp
-            new_spec.end_kp = end_kp
+            new_spec.start_rk = start_rk
+            new_spec.end_rk = end_rk
             new_spec.concentration = concentration
             new_spec.eg = eg
             new_spec.em = em
@@ -138,14 +138,14 @@ class ICAdisTSSpec(SQLSubModel):
         sql = (
             "INSERT INTO " +
             "initial_conditions_spec(id, ic_default, name, reach, " +
-            "start_kp, end_kp, concentration, eg, em, ed, rate, enabled) " +
+            "start_rk, end_rk, concentration, eg, em, ed, rate, enabled) " +
             "VALUES (" +
             f"{self.id}, " +
             f"{ic_default}, " +
             f"'{self._db_format(self._name_section)}', " +
             f"{self._reach}, " +
-            f"{self._start_kp}, " +
-            f"{self._end_kp}, " +
+            f"{self._start_rk}, " +
+            f"{self._end_rk}, " +
             f"{self._concentration}, " +
             f"{self._eg}, " +
             f"{self._em}, " +
@@ -177,21 +177,21 @@ class ICAdisTSSpec(SQLSubModel):
         self._status.modified()
 
     @property
-    def start_kp(self):
-        return self._start_kp
+    def start_rk(self):
+        return self._start_rk
 
-    @start_kp.setter
-    def start_kp(self, start_kp):
-        self._start_kp = start_kp
+    @start_rk.setter
+    def start_rk(self, start_rk):
+        self._start_rk = start_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 
     @property

src/Model/LateralContribution/LateralContribution.py

@@ -93,13 +93,13 @@ class LateralContribution(SQLSubModel):
                 execute(
                     """
                     ALTER TABLE lateral_contribution
-                    RENAME COLUMN begin_kp TO begin_rk
+                    RENAME COLUMN begin_rk TO begin_rk
                     """
                 )
                 execute(
                     """
                     ALTER TABLE lateral_contribution
-                    RENAME COLUMN end_kp TO end_rk
+                    RENAME COLUMN end_rk TO end_rk
                     """
                 )
 

src/Model/LateralContributionsAdisTS/LateralContributionAdisTS.py

@@ -46,8 +46,8 @@ class LateralContributionAdisTS(SQLSubModel):
 
         self._pollutant = pollutant
         self._edge = None
-        self._begin_kp = 0.0
-        self._end_kp = 0.0
+        self._begin_rk = 0.0
+        self._end_rk = 0.0
         self._data = []
         self._header = ["time", "rate"]
         self._types = [self.time_convert, float]
@@ -62,8 +62,8 @@ class LateralContributionAdisTS(SQLSubModel):
             id INTEGER NOT NULL PRIMARY KEY,
             pollutant INTEGER NOT NULL,
             edge INTEGER NOT NULL,
-            begin_kp REAL NOT NULL,
-            end_kp REAL NOT NULL,
+            begin_rk REAL NOT NULL,
+            end_rk REAL NOT NULL,
             FOREIGN KEY(pollutant) REFERENCES Pollutants(id),
             FOREIGN KEY(edge) REFERENCES river_reach(id)
           )
@@ -90,7 +90,7 @@ class LateralContributionAdisTS(SQLSubModel):
         new = []
 
         table = execute(
-            "SELECT id, pollutant, edge, begin_kp, end_kp " +
+            "SELECT id, pollutant, edge, begin_rk, end_rk " +
             "FROM lateral_contribution_adists"
         )
 
@@ -103,8 +103,8 @@ class LateralContributionAdisTS(SQLSubModel):
                 )
 
                 lc.edge = row[2]
-                lc.begin_kp = row[3]
-                lc.end_kp = row[4]
+                lc.begin_rk = row[3]
+                lc.end_rk = row[4]
 
                 values = execute(
                     "SELECT data0, data1 FROM lateral_contribution_data_adists " +
@@ -129,10 +129,10 @@ class LateralContributionAdisTS(SQLSubModel):
 
         sql = (
             "INSERT INTO " +
-            "lateral_contribution_adists(id, pollutant, edge, begin_kp, end_kp) " +
+            "lateral_contribution_adists(id, pollutant, edge, begin_rk, end_rk) " +
             "VALUES (" +
             f"{self.id}, {self._pollutant}, {self.edge}, " +
-            f"{self._begin_kp}, {self._end_kp}" +
+            f"{self._begin_rk}, {self._end_rk}" +
             ")"
         )
         execute(sql)
@@ -196,20 +196,20 @@ class LateralContributionAdisTS(SQLSubModel):
         return self._data.copy()
 
     @property
-    def begin_kp(self):
-        return self._begin_kp
+    def begin_rk(self):
+        return self._begin_rk
 
-    @begin_kp.setter
-    def begin_kp(self, begin_kp):
-        self._begin_kp = begin_kp
+    @begin_rk.setter
+    def begin_rk(self, begin_rk):
+        self._begin_rk = begin_rk
         self._status.modified()
 
     @property
-    def end_kp(self):
-        return self._end_kp
+    def end_rk(self):
+        return self._end_rk
 
-    @end_kp.setter
-    def end_kp(self, end_kp):
-        self._end_kp = end_kp
+    @end_rk.setter
+    def end_rk(self, end_rk):
+        self._end_rk = end_rk
         self._status.modified()
 

src/Model/OutputRKAdists/OutputRKAdists.py

@@ -1,4 +1,4 @@
-# OutputKpAdists.py -- Pamhyr
+# OutputRKAdists.py -- Pamhyr
 # Copyright (C) 2023-2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -30,27 +30,27 @@ from Model.Except import NotImplementedMethodeError
 
 logger = logging.getLogger()
 
-class OutputKpAdists(SQLSubModel):
+class OutputRKAdists(SQLSubModel):
     _sub_classes = []
     _id_cnt = 0
 
-    def __init__(self, id: int = -1, reach = None, kp = None, title: str = "",  status=None):
-        super(OutputKpAdists, self).__init__()
+    def __init__(self, id: int = -1, reach = None, rk = None, title: str = "",  status=None):
+        super(OutputRKAdists, self).__init__()
 
         self._status = status
 
         if id == -1:
-            self.id = OutputKpAdists._id_cnt
+            self.id = OutputRKAdists._id_cnt
         else:
             self.id = id
 
         self._reach = reach
-        self._kp = kp
+        self._rk = rk
         self._title = str(title)
         self._enabled = True
 
-        OutputKpAdists._id_cnt = max(
-            OutputKpAdists._id_cnt + 1, self.id)
+        OutputRKAdists._id_cnt = max(
+            OutputRKAdists._id_cnt + 1, self.id)
 
     @property
     def reach(self):
@@ -62,12 +62,12 @@ class OutputKpAdists(SQLSubModel):
         self._status.modified()
 
     @property
-    def kp(self):
-        return self._kp
+    def rk(self):
+        return self._rk
 
-    @kp.setter
-    def kp(self, profile_id):
-        self._kp = profile_id
+    @rk.setter
+    def rk(self, profile_id):
+        self._rk = profile_id
         self._status.modified()
 
     @property
@@ -84,10 +84,10 @@ class OutputKpAdists(SQLSubModel):
     def _db_create(cls, execute):
 
         sql = (
-            "CREATE TABLE OutputKpAdists(" +
+            "CREATE TABLE OutputRKAdists(" +
             "id INTEGER NOT NULL PRIMARY KEY, " +
             "reach INTEGER NOT NULL, " +
-            "kp REAL NOT NULL, " +
+            "rk REAL NOT NULL, " +
             "title TEXT NOT NULL, " +
             "FOREIGN KEY(reach) REFERENCES river_reach(id)" +
             ")"
@@ -110,20 +110,20 @@ class OutputKpAdists(SQLSubModel):
         status  = data["status"]
 
         table = execute(
-            "SELECT id, reach, kp, title " +
-            f"FROM OutputKpAdists"
+            "SELECT id, reach, rk, title " +
+            f"FROM OutputRKAdists"
         )
 
         if table is not None:
             for row in table:
                 id       = row[0]
                 id_reach = row[1]
-                id_kp    = row[2]
+                id_rk    = row[2]
                 title    = row[3]
 
                 new_output = cls(
                     id=id, reach=id_reach,
-                    kp=id_kp, title=title,
+                    rk=id_rk, title=title,
                     status=status
                 )
 
@@ -133,13 +133,13 @@ class OutputKpAdists(SQLSubModel):
 
     def _db_save(self, execute, data=None):
 
-        execute(f"DELETE FROM OutputKpAdists WHERE id = {self.id}")
+        execute(f"DELETE FROM OutputRKAdists WHERE id = {self.id}")
 
         sql = (
             "INSERT INTO " +
-            "OutputKpAdists(id, reach, kp, title) " +
+            "OutputRKAdists(id, reach, rk, title) " +
             "VALUES (" +
-            f"{self.id}, {self._reach}, {self._kp}, " +
+            f"{self.id}, {self._reach}, {self._rk}, " +
             f"'{self._db_format(self._title)}'" +
             ")"
         )

src/Model/OutputRKAdists/OutputRKListAdists.py

@@ -1,4 +1,4 @@
-# OutputKpListAdists.py -- Pamhyr
+# OutputRKListAdists.py -- Pamhyr
 # Copyright (C) 2024  INRAE
 #
 # This program is free software: you can redistribute it and/or modify
@@ -20,17 +20,17 @@ from tools import trace, timer
 
 from Model.Except import NotImplementedMethodeError
 from Model.Tools.PamhyrList import PamhyrModelList
-from Model.OutputKpAdists.OutputKpAdists import OutputKpAdists
+from Model.OutputRKAdists.OutputRKAdists import OutputRKAdists
 
 
-class OutputKpAdistsList(PamhyrModelList):
-    _sub_classes = [OutputKpAdists]
+class OutputRKAdistsList(PamhyrModelList):
+    _sub_classes = [OutputRKAdists]
 
     @classmethod
     def _db_load(cls, execute, data=None):
         new = cls(status=data["status"])
 
-        new._lst = OutputKpAdists._db_load(execute, data)
+        new._lst = OutputRKAdists._db_load(execute, data)
 
         return new
 
@@ -38,7 +38,7 @@ class OutputKpAdistsList(PamhyrModelList):
         ok = True
 
         # Delete previous data
-        execute("DELETE FROM OutputKpAdists")
+        execute("DELETE FROM OutputRKAdists")
 
         for sl in self._lst:
             ok &= sl._db_save(execute, data)
@@ -46,11 +46,11 @@ class OutputKpAdistsList(PamhyrModelList):
         return ok
 
     @property
-    def OutputKp_List(self):
+    def OutputRK_List(self):
         return self.lst
 
     def new(self, lst, index):
-        n = OutputKpAdists(status=self._status)
+        n = OutputRKAdists(status=self._status)
         self._lst.insert(index, n)
         self._status.modified()
         return n

src/Model/Results/River/RiverAdisTS.py

@@ -35,8 +35,8 @@ class Profile(object):
         return self._profile.name
 
     @property
-    def kp(self):
-        return self._profile.kp
+    def rk(self):
+        return self._profile.rk
 
     @property
     def geometry(self):

src/Model/River.py

@@ -45,7 +45,7 @@ from Model.REPLine.REPLineList import REPLineList
 
 from Solver.Solvers import solver_type_list
 
-from Model.OutputKpAdists.OutputKpListAdists import OutputKpAdistsList
+from Model.OutputRKAdists.OutputRKListAdists import OutputRKAdistsList
 from Model.Pollutants.PollutantsList import PollutantsList
 from Model.InitialConditionsAdisTS.InitialConditionsAdisTSList import InitialConditionsAdisTSList
 from Model.BoundaryConditionsAdisTS.BoundaryConditionsAdisTSList import BoundaryConditionsAdisTSList
@@ -236,7 +236,7 @@ class River(Graph, SQLSubModel):
         HydraulicStructureList,
         AddFileList,
         REPLineList,
-        OutputKpAdistsList,
+        OutputRKAdistsList,
         PollutantsList,
         InitialConditionsAdisTSList,
         BoundaryConditionsAdisTSList,
@@ -266,7 +266,7 @@ class River(Graph, SQLSubModel):
         )
         self._additional_files = AddFileList(status=self._status)
         self._rep_lines = REPLineList(status=self._status)
-        self._Output_kp_adists = OutputKpAdistsList(status=self._status)
+        self._Output_rk_adists = OutputRKAdistsList(status=self._status)
         self._Pollutants = PollutantsList(status=self._status)
         self._InitialConditionsAdisTS = InitialConditionsAdisTSList(status=self._status)
         self._BoundaryConditionsAdisTS = BoundaryConditionsAdisTSList(status=self._status)
@@ -347,7 +347,7 @@ class River(Graph, SQLSubModel):
         )
         new._rep_lines = REPLineList._db_load(execute, data)
 
-        new._Output_kp_adists = OutputKpAdistsList._db_load(
+        new._Output_rk_adists = OutputRKAdistsList._db_load(
             execute, data
         )
 
@@ -382,7 +382,7 @@ class River(Graph, SQLSubModel):
         for solver in self._parameters:
             objs.append(self._parameters[solver])
 
-        objs.append(self._Output_kp_adists)
+        objs.append(self._Output_rk_adists)
         objs.append(self._Pollutants)
         objs.append(self._InitialConditionsAdisTS)
         objs.append(self._BoundaryConditionsAdisTS)
@@ -513,8 +513,8 @@ Last export at: @date."""
         return self._parameters
 
     @property
-    def Output_kp_adists(self):
-        return self._Output_kp_adists
+    def Output_rk_adists(self):
+        return self._Output_rk_adists
 
     @property
     def Pollutants(self):