Changeset 21391

Timestamp:

11/17/16 20:52:20 (8 years ago)

Author:

Eric.Larour

Message:

CHG: fixed rotational feedback formulatoin, which was using index i instead of sid to plug values into the rotational vector. Results should be completely changed.

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -2497 +2497 @@
         IssmDouble      load_love_k2 = -0.30922675; //degree 2 load Love number 
         IssmDouble      m1, m2, m3; 
-        IssmDouble      lati, longi, value; 
+        IssmDouble      lati, longi, radi, value; 
 
         /*Serialize vectors from previous iteration:*/
@@ -2547 +2547 @@
          */
         for(int i=0;i<vertices->Size();i++){
+                int sid;
                 //Vertex* vertex=(Vertex*)vertices->GetObjectByOffset(i);
                 Vertex* vertex=xDynamicCast<Vertex*>(vertices->GetObjectByOffset(i));
-                
-                lati=latitude[i]/180*PI;        longi=longitude[i]/180*PI;
+                sid=vertex->Sid();
+
+                lati=latitude[sid]/180*PI;      longi=longitude[sid]/180*PI; radi=radius[sid];
 
                 /*only first order terms are considered now: */ 
-                value=((1.0+tide_love_k-tide_love_h)/9.81)*pow(omega*radius[i],2.0)*
+                value=((1.0+tide_love_k-tide_love_h)/9.81)*pow(omega*radi,2.0)*
                                                 (-m3/6.0 + 0.5*m3*cos(2.0*lati) - 0.5*sin(2.*lati)*(m1*cos(longi)+m2*sin(longi))); 
         
-                pSgo_rot->SetValue(vertex->Sid(),value,INS_VAL); //INS_VAL ensures that you don't add several times
+                pSgo_rot->SetValue(sid,value,INS_VAL); //INS_VAL ensures that you don't add several times
         }