Changeset 4237

Timestamp:

06/25/10 14:56:58 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed convergence problem (B and n were not loaded into matice leading to negative viscosity)

Location:

issm/trunk/src/c

Files:

• Container/Inputs.cpp (modified) (2 diffs)
• modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (modified) (2 diffs)
• objects/Materials/Matice.cpp (modified) (4 diffs)

issm/trunk/src/c/Container/Inputs.cpp

@@ -401 +401 @@
         /*Compute the 3d Strain Rate (6 components):
          *
-         * epsilon=[exx eyy ezz exy exz euz]
+         * epsilon=[exx eyy ezz exy exz eyz]
          */
 
@@ -460 +460 @@
         /*Compute the 3d Blatter/PattynStrain Rate (5 components):
          *
-         * epsilon=[exx eyy exy exz euz]
+         * epsilon=[exx eyy exy exz eyz]
          *
          * with exz=1/2 du/dz

issm/trunk/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp

@@ -38 +38 @@
         IoModelFetchData(&iomodel->upperelements,NULL,NULL,iomodel_handle,"upperelements");
         IoModelFetchData(&iomodel->lowerelements,NULL,NULL,iomodel_handle,"lowerelements");
+        IoModelFetchData(&iomodel->rheology_B,NULL,NULL,iomodel_handle,"rheology_B");
+        IoModelFetchData(&iomodel->rheology_n,NULL,NULL,iomodel_handle,"rheology_n");
         
         /*Create elements and materials: */
@@ -57 +59 @@
         xfree((void**)&iomodel->upperelements);
         xfree((void**)&iomodel->lowerelements);
+        xfree((void**)&iomodel->rheology_B);
+        xfree((void**)&iomodel->rheology_n);
 
         /*Add new constrant material property tgo materials, at the end: */

issm/trunk/src/c/objects/Materials/Matice.cpp

@@ -231 +231 @@
         }
 
+        /*Checks in debugging mode*/
+        ISSMASSERT(B>0);
+        ISSMASSERT(n>0);
+        ISSMASSERT(viscosity>0);
+
         /*Return: */
         *pviscosity=viscosity;
@@ -291 +296 @@
                 }
         }
+
+        /*Checks in debugging mode*/
+        ISSMASSERT(B>0);
+        ISSMASSERT(n>0);
+        ISSMASSERT(viscosity3d>0);
 
         /*Assign output pointers:*/
@@ -356 +366 @@
         }
 
+        /*Checks in debugging mode*/
+        ISSMASSERT(B>0);
+        ISSMASSERT(n>0);
+        ISSMASSERT(viscosity3d>0);
+
         /*Assign output pointers:*/
         *pviscosity3d=viscosity3d;
@@ -405 +420 @@
                 viscosity_complement=4.5*pow((double)10,(double)17);
         }
+
+        /*Checks in debugging mode*/
+        ISSMASSERT(B>0);
+        ISSMASSERT(n>0);
+        ISSMASSERT(viscosity_complement>0);
                 
         /*Return: */