Changeset 18674 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

10/24/14 13:29:24 (10 years ago)

Author:

seroussi

Message:

CHG: moved analysis to be supported in FemModel

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (1 diff)

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

@@ -496 +496 @@
 
                 case TransientSolutionEnum:
-                        analyses_temp[numanalyses++]=StressbalanceAnalysisEnum;
-                        analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum;
-                        analyses_temp[numanalyses++]=StressbalanceSIAAnalysisEnum;
+                        bool isSIA,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage;
+                        iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
+                        iomodel->Constant(&isthermal,TransientIsthermalEnum);
+                        iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum);
+                        iomodel->Constant(&islevelset,TransientIslevelsetEnum);
+                        iomodel->Constant(&ismasstransport,TransientIsmasstransportEnum);
+                        iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum);
+                        iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
+                        iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum);
+                        iomodel->Constant(&ishydrology,TransientIshydrologyEnum);
+                        if(isstressbalance){
+                                analyses_temp[numanalyses++]=StressbalanceAnalysisEnum;
+                                analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum;
+                                if(isSIA){
+                                        analyses_temp[numanalyses++]=StressbalanceSIAAnalysisEnum;
+                                }
+                        }
+                        if(isthermal && iomodel->domaintype==Domain3DEnum){
+                                if(isenthalpy){
+                                        analyses_temp[numanalyses++]=EnthalpyAnalysisEnum;
+                                }
+                                else{
+                                        analyses_temp[numanalyses++]=ThermalAnalysisEnum;
+                                        analyses_temp[numanalyses++]=MeltingAnalysisEnum;
+                                }
+                        }
+                        if(ismasstransport || isgroundingline){
+                                analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
+                        }
+                        if(islevelset){
+                                analyses_temp[numanalyses++]=LevelsetAnalysisEnum;
+                                analyses_temp[numanalyses++]=ExtrapolationAnalysisEnum;
+                                analyses_temp[numanalyses++]=LsfReinitializationAnalysisEnum;
+                        }
+                        if(ishydrology){
+                                analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
+                                analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
+                                analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
+                                analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
+                        }
+                        if(isdamage){
+                                analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
+                        }
+
+                        if(iomodel->domaintype==Domain2DverticalEnum || iomodel->domaintype==Domain3DEnum){
+                                analyses_temp[numanalyses++]=ExtrudeFromBaseAnalysisEnum;
+                                analyses_temp[numanalyses++]=ExtrudeFromTopAnalysisEnum;
+                                analyses_temp[numanalyses++]=FreeSurfaceBaseAnalysisEnum;
+                                analyses_temp[numanalyses++]=FreeSurfaceTopAnalysisEnum;
+                        }
                         analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
-                        analyses_temp[numanalyses++]=ThermalAnalysisEnum;
-                        analyses_temp[numanalyses++]=MeltingAnalysisEnum;
-                        analyses_temp[numanalyses++]=EnthalpyAnalysisEnum;
-                        analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
-                        analyses_temp[numanalyses++]=FreeSurfaceBaseAnalysisEnum;
-                        analyses_temp[numanalyses++]=FreeSurfaceTopAnalysisEnum;
-                        analyses_temp[numanalyses++]=ExtrudeFromBaseAnalysisEnum;
-                        analyses_temp[numanalyses++]=ExtrudeFromTopAnalysisEnum;
-                        analyses_temp[numanalyses++]=LevelsetAnalysisEnum;
-                        analyses_temp[numanalyses++]=ExtrapolationAnalysisEnum;
-                        analyses_temp[numanalyses++]=LsfReinitializationAnalysisEnum;
-                        analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
-                        analyses_temp[numanalyses++]=HydrologyShreveAnalysisEnum;
-                        analyses_temp[numanalyses++]=HydrologyDCInefficientAnalysisEnum;
-                        analyses_temp[numanalyses++]=HydrologyDCEfficientAnalysisEnum;
-                        analyses_temp[numanalyses++]=L2ProjectionEPLAnalysisEnum;
                         break;