Changeset 26146

Timestamp:

03/24/21 09:04:54 (4 years ago)

Author:

Eric.Larour

Message:

CHG: various bug fixes.

File:

• issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp (modified) (3 diffs)

issm/trunk-jpl/src/c/cores/sealevelchange_core.cpp ¶

@@ -513 +513 @@
         for(;;){
                         
-                oldsealevelloads=sealevelloads->Duplicate();
+                oldsealevelloads=sealevelloads->Duplicate(); sealevelloads->Copy(oldsealevelloads);
 
                 /*convolve load and sealevel loads on oceans:*/
@@ -561 +561 @@
         }
 
-        femmodel->inputs->AXPY(1,SealevelEnum,SealevelGRDEnum);
-        femmodel->inputs->AXPY(1,BedEnum,BedGRDEnum);
+        femmodel->inputs->AXPY(1,SealevelGRDEnum,SealevelEnum);
+        femmodel->inputs->AXPY(1,BedGRDEnum,BedEnum);
         if(horiz){
-                femmodel->inputs->AXPY(1,BedEastEnum,BedEastGRDEnum);
-                femmodel->inputs->AXPY(1,BedNorthEnum,BedNorthGRDEnum);
+                femmodel->inputs->AXPY(1,BedEastGRDEnum,BedEastEnum);
+                femmodel->inputs->AXPY(1,BedNorthGRDEnum, BedNorthEnum);
         }
 
@@ -1268 +1268 @@
         IssmDouble  moi_e, moi_p;
         IssmDouble      m1, m2, m3;
+        bool rotation=false;
+        
+        /*early return?:*/
+        femmodel->parameters->FindParam(&rotation,SolidearthSettingsRotationEnum);
+        if(!rotation)return;
 
         /*retrieve parameters: */