Changeset 12272

Timestamp:

05/21/12 14:35:31 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed BIG error in prognostic: melting rate correction was never defined

Location:

issm/trunk-jpl/src/c/objects

Files:

• Elements/Tria.cpp (modified) (1 diff)
• Numerics/ElementVector.cpp (modified) (2 diffs)
• Numerics/ElementVector.h (modified) (1 diff)

issm/trunk-jpl/src/c/objects/Elements/Tria.cpp

@@ -629 +629 @@
                 basal_melting_input->GetInputValue(&basal_melting_g,gauss);
                 thickness_input->GetInputValue(&thickness_g,gauss);
-                if(basal_melting_correction_input) basal_melting_correction_input->GetInputValue(&basal_melting_correction_g,gauss);
+                if(basal_melting_correction_input)
+                 basal_melting_correction_input->GetInputValue(&basal_melting_correction_g,gauss);
+                else
+                 basal_melting_correction_g=0.;
 
                 for(i=0;i<numdof;i++) pe->values[i]+=Jdettria*gauss->weight*(thickness_g+dt*(surface_mass_balance_g-basal_melting_g-basal_melting_correction_g))*L[i];

issm/trunk-jpl/src/c/objects/Numerics/ElementVector.cpp

@@ -166 +166 @@
         double* localvalues=NULL;
 
+        /*In debugging mode, check consistency (no NaN, and values not too big)*/
+        this->CheckConsistency();
+
         if(this->fsize){
                 /*first, retrieve values that are in the f-set from the g-set values vector: */
@@ -200 +203 @@
         }
 
+}
+/*}}}*/
+/*FUNCTION ElementVector::CheckConsistency{{{1*/
+void ElementVector::CheckConsistency(void){
+        /*Check element matrix values, only in debugging mode*/
+#ifdef _ISSM_DEBUG_ 
+        for (int i=0;i<this->nrows;i++){
+                if (isnan(this->values[i])) _error_("NaN found in Element Vector");
+                if (fabs( this->values[i])>1.e+50) _error_("Element Vector values exceeds 1.e+50");
+        }
+#endif
 }
 /*}}}*/

issm/trunk-jpl/src/c/objects/Numerics/ElementVector.h

@@ -43 +43 @@
                 void InsertIntoGlobal(Vector* pf);
                 void Echo(void);
+                void CheckConsistency(void);
                 void Init(ElementVector* pe);
                 void SetValue(double scalar);