Changeset 27093

Timestamp:

06/22/22 16:10:58 (3 years ago)

Author:

Eric.Larour

Message:

CHG: various debugging.

Location:

issm/branches/trunk-larour-SLPS2022/src/c/cores

Files:

• mmemasstransport_core.cpp (modified) (5 diffs)
• transient_core.cpp (modified) (1 diff)

issm/branches/trunk-larour-SLPS2022/src/c/cores/mmemasstransport_core.cpp

@@ -14 +14 @@
 
         /*Start profiler*/
-        femmodel->profiler->Start(OCEANTRANSPORTCORE);
+        femmodel->profiler->Start(MMEMASSTRANSPORTCORE);
 
         /*parameters: */
@@ -22 +22 @@
         int    solution_type;
         Vector<IssmDouble>*  ug  = NULL;
+        char** requested_outputs = NULL;
 
         /*activate configuration*/
@@ -28 +29 @@
         /*recover parameters: */
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
+        femmodel->parameters->FindParam(&numoutputs,MmemasstransportNumRequestedOutputsEnum);
         femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,MmemasstransportRequestedOutputsEnum);
 
         if(VerboseSolution()) _printf0_("   computing MME mass transport\n");
 
-        /*grab delta thickness from MmemasstransportDeltathicknessEnum inputs in each element, assemble into a vector and feed to 
+        /*save current thickness before updating:*/
+        InputDuplicatex(femmodel,ThicknessEnum,ThicknessOldEnum);
+
+        /*grab thickness from MmemasstransportThicknessEnum inputs in each element, assemble into a vector and feed to 
          * InputUpdateFromSolutionx which will deal with accumulating such inputs:*/
         GetSolutionFromInputsx(&ug,femmodel); 
@@ -39 +45 @@
         SolidEarthMmemasstransportUpdates(femmodel);
 
+        if(save_results){
+                femmodel->RequestedOutputsx(&femmodel->results,requested_outputs,numoutputs);
+        }
         if(solution_type==MmemasstransportSolutionEnum)femmodel->RequestedDependentsx();
+
+        /*Free ressources:*/
+        if(numoutputs){for(int i=0;i<numoutputs;i++){xDelete<char>(requested_outputs[i]);} xDelete<char*>(requested_outputs);}
 
         /*profiler*/
@@ -58 +70 @@
         femmodel->parameters->FindParam(&count,SealevelchangeRunCountEnum);
 
-        /* Accumulate delta thikcness: */
-        femmodel->inputs->AXPY(+1, DeltaThicknessEnum,AccumulatedDeltaThicknessEnum);
+        /* From old and new thickness, create delta ice thicknes, and accumulate:*/
+        femmodel->inputs->ZAXPY(-1, ThicknessOldEnum,ThicknessEnum,DeltaIceThicknessEnum);
+        femmodel->inputs->AXPY(+1, DeltaIceThicknessEnum,AccumulatedDeltaIceThicknessEnum);
 
-        /* Compute total thickness change between two sea-level solver time steps, ie. every frequency*dt. */
+        /* Compute total ice thickness change between two sea-level solver time steps, ie. every frequency*dt. */
         if(count==frequency){
-                femmodel->inputs->ZAXPY(-1, OldAccumulatedDeltaThicknessEnum,AccumulatedDeltaThicknessEnum,DeltaThicknessEnum);
-                femmodel->inputs->DuplicateInput(AccumulatedDeltaThicknessEnum,OldAccumulatedDeltaThicknessEnum);
+                femmodel->inputs->ZAXPY(-1, OldAccumulatedDeltaIceThicknessEnum,AccumulatedDeltaIceThicknessEnum,DeltaIceThicknessEnum);
+                femmodel->inputs->DuplicateInput(AccumulatedDeltaIceThicknessEnum,OldAccumulatedDeltaIceThicknessEnum);
         }
         return;

issm/branches/trunk-larour-SLPS2022/src/c/cores/transient_core.cpp

@@ -142 +142 @@
         femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
         femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
-        femmodel->parameters->FindParam(&ismmemasstransport,TransientIsMmemasstransportEnum);
+        femmodel->parameters->FindParam(&ismmemasstransport,TransientIsmmemasstransportEnum);
         femmodel->parameters->FindParam(&isoceantransport,TransientIsoceantransportEnum);
         femmodel->parameters->FindParam(&issmb,TransientIssmbEnum);