Changeset 17816

Timestamp:

04/22/14 15:41:01 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: sime bug fixing

Location:

issm/trunk-jpl/src/c

Files:

• classes/Elements/Tria.cpp (modified) (1 diff)
• shared/Elements/Arrhenius.cpp (modified) (1 diff)
• solutionsequences/solutionsequence_newton.cpp (modified) (1 diff)

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

@@ -150 +150 @@
 void  Tria::ComputeSigmaNN(){
 
-        if(~IsOnBase()){
+        if(!IsOnBase()){
                 IssmDouble sigma_nn=0;
                 this->inputs->AddInput(new TriaInput(SigmaNNEnum,&sigma_nn,P0Enum));

issm/trunk-jpl/src/c/shared/Elements/Arrhenius.cpp

@@ -34 +34 @@
         /*convert temperature to absolute temperature*/
         _assert_(depth>0);
+        printf("temperature = %g beta = %g depth = %g\n",temperature,beta,depth);
         Tstar=temperature-beta*depth;
         _assert_(Tstar>0);

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_newton.cpp

@@ -68 +68 @@
 
                 /*Prepare next iteration using Newton's method*/
-                SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);delete df;
+                SystemMatricesx(&Kff,&Kfs,&pf,&df,&kmax,femmodel);delete df;
                 CreateNodalConstraintsx(&ys,femmodel->nodes,configuration_type);
                 Reduceloadx(pf,Kfs,ys);delete Kfs;