Merge pull request #21 from mansakrishna23/main

residual names directly connected to equation type
ISSMteam · May 9, 2024 · 22fb32d · 22fb32d
2 parents 81beedb + 35332ac
commit 22fb32d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pinnicle/physics/continuity.py b/pinnicle/physics/continuity.py
@@ -17,7 +17,7 @@ def set_default(self):
         self.output_lb = [-1.0e4/self.yts, -1.0e4/self.yts, -5.0/self.yts, 10.0]
         self.output_ub = [ 1.0e4/self.yts,  1.0e4/self.yts,  5/self.yts, 2500.0]
         self.data_weights = [1.0e-8*self.yts**2, 1.0e-8*self.yts**2, 1.0*self.yts**2, 1.0e-6]
-        self.residuals = ["fMC"]
+        self.residuals = ["f"+self._EQUATION_TYPE]
         self.pde_weights = [1.0e8]
 
         # scalar variables: name:value

diff --git a/pinnicle/physics/stressbalance.py b/pinnicle/physics/stressbalance.py
@@ -17,7 +17,7 @@ def set_default(self):
         self.output_lb = [-1.0e4/self.yts, -1.0e4/self.yts, -1.0e3, 10.0, 0.01]
         self.output_ub = [ 1.0e4/self.yts,  1.0e4/self.yts,  2.5e3, 2000.0, 1.0e4]
         self.data_weights = [1.0e-8*self.yts**2.0, 1.0e-8*self.yts**2.0, 1.0e-6, 1.0e-6, 1.0e-8]
-        self.residuals = ["fSSA1", "fSSA2"]
+        self.residuals = ["f"+self._EQUATION_TYPE+"1", "f"+self._EQUATION_TYPE+"2"]
         self.pde_weights = [1.0e-10, 1.0e-10]
 
         # scalar variables: name:value
@@ -99,7 +99,7 @@ def set_default(self):
         self.output_lb = [-1.0e4/self.yts, -1.0e4/self.yts, -1.0e4/self.yts, -1.0e4/self.yts, -1.0e3, 10.0, 0.01]
         self.output_ub = [ 1.0e4/self.yts,  1.0e4/self.yts,  1.0e4/self.yts,  1.0e4/self.yts,  2.5e3, 2000.0, 1.0e4]
         self.data_weights = [1.0e-8*self.yts**2.0, 1.0e-8*self.yts**2.0, 1.0e-8*self.yts**2.0, 1.0e-8*self.yts**2.0, 1.0e-6, 1.0e-6, 1.0e-8]
-        self.residuals = ["fMOLHO 1", "fMOLHO 2", "fMOLHO base 1", "fMOLHO base 2"]
+        self.residuals = ["f"+self._EQUATION_TYPE+" 1", "f"+self._EQUATION_TYPE+" 2", "f"+self._EQUATION_TYPE+" base 1", "f"+self._EQUATION_TYPE+" base 2"]
         self.pde_weights = [1.0e-10, 1.0e-10, 1.0e-10, 1.0e-10]
 
         # scalar variables: name:value