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

Timestamp:

08/30/15 16:01:06 (10 years ago)

Author:

Eric.Larour

Message:

CHG: transferred Smb code from the Masstransport side of things into a full fledged SmbAnalysis
object.

File:

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

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

@@ -496 +496 @@
                 case MasstransportSolutionEnum:
                         analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
+                        analyses_temp[numanalyses++]=SmbAnalysisEnum;
                         break;
 
@@ -529 +530 @@
                         break;
                 
+                case SmbSolutionEnum:
+                        analyses_temp[numanalyses++]=SmbAnalysisEnum;
+                        break;
+
                 case DamageEvolutionSolutionEnum:
                         analyses_temp[numanalyses++]=DamageEvolutionAnalysisEnum;
@@ -534 +539 @@
 
                 case TransientSolutionEnum:{
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,islevelset,ishydrology,isdamage,issmb;
                         iomodel->Constant(&isSIA,FlowequationIsSIAEnum);
                         iomodel->Constant(&isFS,FlowequationIsFSEnum);
@@ -545 +550 @@
                         iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum);
                         iomodel->Constant(&ishydrology,TransientIshydrologyEnum);
+                        iomodel->Constant(&issmb,TransientIssmbEnum);
                         if(isstressbalance){
                                 int  fe_FS;
@@ -570 +576 @@
                                 analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
                         }
+                        if(issmb) analyses_temp[numanalyses++]=SmbAnalysisEnum;
                         if(islevelset){
                                 analyses_temp[numanalyses++]=LevelsetAnalysisEnum;