Changeset 21330

Timestamp:

10/30/16 23:13:29 (8 years ago)

Author:

Eric.Larour

Message:

CHG: some bug fixes.

Location:

issm/branches/trunk-larour-NatGeoScience2016/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• classes/Elements/Element.cpp (modified) (1 diff)
• cores/sealevelrise_core.cpp (modified) (1 diff)

issm/branches/trunk-larour-NatGeoScience2016/src/c/analyses/SealevelriseAnalysis.cpp ¶

@@ -42 +42 @@
         /*Initialize cumdeltalthickness input: unfortunately, we don't have femmodel, so we need to iterate on 
          *elements, otherwise we would have used InputUpdateFromConstantx: */
+        counter=0;
         for(int i=0;i<iomodel->numberofelements;i++){
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->InputUpdateFromConstant(0,SealevelriseCumDeltathicknessEnum);
+                        element->InputUpdateFromConstant(0.0,SealevelriseCumDeltathicknessEnum);
                         counter++;
                 }

issm/branches/trunk-larour-NatGeoScience2016/src/c/classes/Elements/Element.cpp ¶

@@ -1585 +1585 @@
                                 name==SealevelEustaticEnum || 
                                 name==SealevelriseDeltathicknessEnum || 
+                                name==SealevelriseCumDeltathicknessEnum || 
                                 name==GiaWEnum || 
                                 name==GiadWdtEnum ||

issm/branches/trunk-larour-NatGeoScience2016/src/c/cores/sealevelrise_core.cpp ¶

@@ -417 +417 @@
         Vector<IssmDouble>* deltathickness=NULL; 
         Vector<IssmDouble>* cumdeltathickness=NULL; 
-        IssmDouble frequency=1;
+        int frequency=1;
         int count;