Changeset 22306

Timestamp:

12/22/17 09:34:11 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: WARNING This is a significant change, we do not average B, D and E over the element anymore because this makes models with few layers but high degree of interpolation useless

Location:

issm/trunk-jpl/src/c/classes/Materials

Files:

• Matestar.cpp (modified) (8 diffs)
• Matice.cpp (modified) (8 diffs)

issm/trunk-jpl/src/c/classes/Materials/Matestar.cpp

@@ -136 +136 @@
         /*
          * A = 1/B^n
-    */
-
-        IssmDouble B,n;
-
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum);
-        n=this->GetN();
+         */
+
+        IssmDouble B=this->GetB(gauss);
+        IssmDouble n=this->GetN();
 
         return pow(B,-n);
@@ -151 +149 @@
          */
 
-        IssmDouble B,n;
-
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBbarEnum);
-        n=this->GetN();
+        IssmDouble B=this->GetBbar(gauss);
+        IssmDouble n=this->GetN();
 
         return pow(B,-n);
@@ -164 +160 @@
         IssmDouble B;
 
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum);
+        Input* B_input = element->GetInput(MaterialsRheologyBEnum); _assert_(B_input);
+        B_input->GetInputValue(&B,gauss);
         return B;
 }
@@ -173 +170 @@
         IssmDouble Bbar;
 
-        element->inputs->GetInputAverage(&Bbar,MaterialsRheologyBbarEnum);
+        Input* B_input = element->GetInput(MaterialsRheologyBbarEnum); _assert_(B_input);
+        B_input->GetInputValue(&Bbar,gauss);
         return Bbar;
 }
@@ -191 +189 @@
         IssmDouble Ec;
 
-        element->inputs->GetInputAverage(&Ec,MaterialsRheologyEcEnum);
+        Input* Ec_input = element->GetInput(MaterialsRheologyEcEnum); _assert_(Ec_input);
+        Ec_input->GetInputValue(&Ec,gauss);
         return Ec;
 }
@@ -200 +199 @@
         IssmDouble Ecbar;
 
-        element->inputs->GetInputAverage(&Ecbar,MaterialsRheologyEcbarEnum);
+        Input* Ecbar_input = element->GetInput(MaterialsRheologyEcbarEnum); _assert_(Ecbar_input);
+        Ecbar_input->GetInputValue(&Ecbar,gauss);
         return Ecbar;
 }
@@ -209 +209 @@
         IssmDouble Es;
 
-        element->inputs->GetInputAverage(&Es,MaterialsRheologyEsEnum);
+        Input* Es_input = element->GetInput(MaterialsRheologyEsEnum); _assert_(Es_input);
+        Es_input->GetInputValue(&Es,gauss);
         return Es;
 }
@@ -218 +219 @@
         IssmDouble Esbar;
 
-        element->inputs->GetInputAverage(&Esbar,MaterialsRheologyEsbarEnum);
+        Input* Esbar_input = element->GetInput(MaterialsRheologyEsbarEnum); _assert_(Esbar_input);
+        Esbar_input->GetInputValue(&Esbar,gauss);
         return Esbar;
 }

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -198 +198 @@
          */
 
-        IssmDouble B,n;
-
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum);
-        n=this->GetN();
+        IssmDouble B=this->GetB(gauss);
+        IssmDouble n=this->GetN();
 
         return pow(B,-n);
@@ -211 +209 @@
          */
 
-        IssmDouble B,n;
-
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBbarEnum);
-        n=this->GetN();
+        IssmDouble B=this->GetBbar(gauss);
+        IssmDouble n=this->GetN();
 
         return pow(B,-n);
@@ -224 +220 @@
         IssmDouble B;
 
-        element->inputs->GetInputAverage(&B,MaterialsRheologyBEnum);
+        Input* B_input = element->GetInput(MaterialsRheologyBEnum); _assert_(B_input);
+        B_input->GetInputValue(&B,gauss);
         return B;
 }
@@ -233 +230 @@
         IssmDouble Bbar;
 
-        element->inputs->GetInputAverage(&Bbar,MaterialsRheologyBbarEnum);
+        Input* B_input = element->GetInput(MaterialsRheologyBbarEnum); _assert_(B_input);
+        B_input->GetInputValue(&Bbar,gauss);
         return Bbar;
 }
@@ -242 +240 @@
         /*Output*/
         IssmDouble D;
-        if(this->isdamaged)element->inputs->GetInputAverage(&D,DamageDEnum);
+        if(this->isdamaged){
+                Input* D_input = element->GetInput(DamageDEnum); _assert_(D_input);
+                D_input->GetInputValue(&D,gauss);
+        }
+        else{
+                _error_("Cannot get DamageD for non damaged ice");
+        }
         return D;
 }
@@ -251 +255 @@
         /*Output*/
         IssmDouble Dbar;
-        if(this->isdamaged)element->inputs->GetInputAverage(&Dbar,DamageDbarEnum);
+        if(this->isdamaged){
+                Input* D_input = element->GetInput(DamageDbarEnum); _assert_(D_input);
+                D_input->GetInputValue(&Dbar,gauss);
+        }
+        else{
+                _error_("Cannot get DamageD for non damaged ice");
+        }
         return Dbar;
 }
@@ -260 +270 @@
         /*Output*/
         IssmDouble E;
-        if(this->isenhanced)element->inputs->GetInputAverage(&E,MaterialsRheologyEEnum);
+        Input* E_input = element->GetInput(MaterialsRheologyEEnum); _assert_(E_input);
+        E_input->GetInputValue(&E,gauss);
         return E;
 }
@@ -269 +280 @@
         /*Output*/
         IssmDouble Ebar;
-        if(this->isenhanced)element->inputs->GetInputAverage(&Ebar,MaterialsRheologyEbarEnum);
+        Input* E_input = element->GetInput(MaterialsRheologyEbarEnum); _assert_(E_input);
+        E_input->GetInputValue(&Ebar,gauss);
         return Ebar;
 }