source: issm/oecreview/Archive/18296-19100/ISSM-18828-18829.diff@ 19102

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

@@ -513 +513 @@
                         break;
 
                 case TransientSolutionEnum:{
-                        bool isSIA,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage;
                         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
+                        iomodel->Constant(&isFS,FlowequationIsFSEnum);
                         iomodel->Constant(&isthermal,TransientIsthermalEnum);
                         iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum);
                         iomodel->Constant(&islevelset,TransientIslevelsetEnum);
@@ -524 +525 @@
                         iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum);
                         iomodel->Constant(&ishydrology,TransientIshydrologyEnum);
                         if(isstressbalance){
+                                int  fe_FS;
+                                iomodel->Constant(&fe_FS,FlowequationFeFSEnum);
                                 analyses_temp[numanalyses++]=StressbalanceAnalysisEnum;
                                 analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum;
                                 if(isSIA){
                                         analyses_temp[numanalyses++]=StressbalanceSIAAnalysisEnum;
                                 }
+                                analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;
+                                analyses_temp[numanalyses++]=ExtrudeFromBaseAnalysisEnum;
+                                analyses_temp[numanalyses++]=DepthAverageAnalysisEnum;
+                                if(fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){
+                                        analyses_temp[numanalyses++]=UzawaPressureAnalysisEnum;
+                                }
                         }
                         if(isthermal && iomodel->domaintype==Domain3DEnum){
                                 if(isenthalpy){
@@ -765 +774 @@
                                 case ThicknessAlongGradientEnum:    ThicknessAlongGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters);     break;
                                 case ThicknessAcrossGradientEnum:   ThicknessAcrossGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters);    break;
                                 case RheologyBbarAbsGradientEnum:   RheologyBbarAbsGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters);    break;
+                                case RheologyBAbsGradientEnum:      RheologyBAbsGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters);  break;
                                 case DragCoefficientAbsGradientEnum:DragCoefficientAbsGradientx(&double_result,elements,nodes,vertices,loads,materials,parameters); break;
                                 case BalancethicknessMisfitEnum:    BalancethicknessMisfitx(&double_result);                                                        break;
                                 case SurfaceAbsMisfitEnum:          SurfaceAbsMisfitx(&double_result); break;