Changeset 24991

Timestamp:

06/09/20 09:50:01 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: better handling of list of analyses in transient by recursively call AnalysesList

Location:

issm/trunk-jpl/src/c

Files:

• classes/FemModel.cpp (modified) (3 diffs)
• cores/levelsetfunctionslope_core.cpp (modified) (1 diff)

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

@@ -648 +648 @@
         /*output: */
         int  numanalyses = 0;
-        int* analyses=NULL;
+        int *analyses    = NULL;
 
         /*Intermediaries*/
@@ -778 +778 @@
 
                 case TransientSolutionEnum:{
+                        /*We have multiple analyses here, process one by one*/
                         bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isesa,isgia;
-                        iomodel->FindConstant(&isSIA,"md.flowequation.isSIA");
-                        iomodel->FindConstant(&isFS,"md.flowequation.isFS");
                         iomodel->FindConstant(&isthermal,"md.transient.isthermal");
-                        iomodel->FindConstant(&isenthalpy,"md.thermal.isenthalpy");
                         iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront");
                         iomodel->FindConstant(&ismasstransport,"md.transient.ismasstransport");
@@ -793 +791 @@
                         iomodel->FindConstant(&isesa,"md.transient.isesa");
                         iomodel->FindConstant(&isgia,"md.transient.isgia");
+         int* analyses_iter     = NULL;
+         int  num_analyses_iter = 0;
                         if(isstressbalance){
-                                int  fe_FS;
-                                iomodel->FindConstant(&fe_FS,"md.flowequation.fe_FS");
-                                analyses_temp[numanalyses++]=StressbalanceAnalysisEnum;
-                                analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum;
-                                if(isSIA){
-                                        analyses_temp[numanalyses++]=StressbalanceSIAAnalysisEnum;
-                                }
-                                analyses_temp[numanalyses++]=DepthAverageAnalysisEnum;
-                                if(fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){
-                                        analyses_temp[numanalyses++]=UzawaPressureAnalysisEnum;
-                                }
-                        }
+                                SolutionAnalysesList(&analyses_iter,&num_analyses_iter,iomodel,StressbalanceSolutionEnum);
+            xMemCpy<int>(&analyses_temp[numanalyses],analyses_iter,num_analyses_iter);
+                                numanalyses+=num_analyses_iter; xDelete<int>(analyses_iter);
+         }
                         if(isthermal && iomodel->domaintype==Domain3DEnum){
-                                if(isenthalpy){
-                                        analyses_temp[numanalyses++]=EnthalpyAnalysisEnum;
-                                }
-                                else{
-                                        analyses_temp[numanalyses++]=ThermalAnalysisEnum;
-                                        analyses_temp[numanalyses++]=MeltingAnalysisEnum;
-                                }
+                                SolutionAnalysesList(&analyses_iter,&num_analyses_iter,iomodel,ThermalSolutionEnum);
+            xMemCpy<int>(&analyses_temp[numanalyses],analyses_iter,num_analyses_iter);
+                                numanalyses+=num_analyses_iter; xDelete<int>(analyses_iter);
                         }
                         if(ismasstransport || isgroundingline){

issm/trunk-jpl/src/c/cores/levelsetfunctionslope_core.cpp

@@ -20 +20 @@
         femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
 
-        if(VerboseSolution()) _printf0_("computing slope of levelset function...\n");
+        if(VerboseSolution()) _printf0_("   computing slope of levelset function...\n");
 
         /*Call on core computations: */