Changeset 18829

Timestamp:

11/21/14 15:45:35 (10 years ago)

Author:

hongjuy

Message:

NEW: added new requested output (regularization) and support for Uzawa in transient

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (3 diffs)

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

@@ -514 +514 @@
 
                 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);
@@ -525 +526 @@
                         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;
                                 }
                         }
@@ -766 +775 @@
                                 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;