Change THCM to initialise from const parameterlists.

nlesc-smcm · Oct 29, 2019 · 611afa5 · 611afa5
1 parent 6056070
commit 611afa5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/src/ocean/Ocean.C b/src/ocean/Ocean.C
@@ -95,7 +95,7 @@ Ocean::Ocean(RCP<Epetra_Comm> Comm, ParameterList oceanParamList)
     //  THCM is implemented as a Singleton, which allows only a single
     //  instance at a time. The Ocean class can access THCM with a call
     //  to THCM::Instance()
-    Teuchos::ParameterList &thcmList =
+    const Teuchos::ParameterList &thcmList =
         oceanParamList->sublist("THCM");
 
     thcm_ = rcp(new THCM(thcmList, comm_));
@@ -128,7 +128,7 @@ Ocean::Ocean(RCP<Epetra_Comm> Comm, ParameterList oceanParamList)
     grid_   = rcp(new OceanGrid(domain_));
 
     // Read starting parameters from xml
-    Teuchos::ParameterList& startList =
+    const Teuchos::ParameterList& startList =
         thcmList.sublist("Starting Parameters");
     THCM::Instance().ReadParameters(startList);
 

diff --git a/src/ocean/THCM.C b/src/ocean/THCM.C
@@ -182,7 +182,7 @@ extern "C" {
 
 //=============================================================================
 // constructor
-THCM::THCM(Teuchos::ParameterList& params, Teuchos::RCP<Epetra_Comm> comm) :
+THCM::THCM(const Teuchos::ParameterList& params, Teuchos::RCP<Epetra_Comm> comm) :
     Singleton<THCM>(Teuchos::rcp(this, false)),
     Comm(comm),
     nullSpace(Teuchos::null),
@@ -1891,17 +1891,16 @@ void THCM::printTiming(std::ostream& os)
 }
 
 //=============================================================================
-void THCM::ReadParameters(Teuchos::ParameterList& plist)
+void THCM::ReadParameters(const Teuchos::ParameterList& plist)
 {
     double val;
     std::string label;
     try {
         for (int i=0; i<= _NPAR_ + _NPAR_TRILI; i++)
         {
             label = int2par(i);
-            if (plist.isParameter(label))
-            {
-                val = plist.get(label,defaultParameter(label));
+            if (plist.isParameter(label)) {
+                val = plist.get<double>(label);
                 this->setParameter(label,val);
             }
         }

diff --git a/src/ocean/THCM.H b/src/ocean/THCM.H
@@ -123,7 +123,7 @@ public:
     };
 
     //! Constructor
-    THCM(Teuchos::ParameterList& params, Teuchos::RCP<Epetra_Comm> comm);
+    THCM(const Teuchos::ParameterList& params, Teuchos::RCP<Epetra_Comm> comm);
 
     //! Destructor
 
@@ -364,7 +364,7 @@ public:
     std::string const int2par(int ind);
 
     //! read THCM parameters from a ParameterList
-    void ReadParameters(Teuchos::ParameterList& plist);
+    void ReadParameters(const Teuchos::ParameterList& plist);
 
     //! Under non-restoring conditions: get an integral from vec and
     //! use that to correct the integral condition