Changeset 28094

Timestamp:

02/06/24 10:58:34 (14 months ago)

Author:

Mathieu Morlighem

Message:

CHG: do not include free surface solver everytime

File:

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

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

@@ -860 +860 @@
                 case TransientSolutionEnum:{
                         /*We have multiple analyses here, process one by one*/
-                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isoceantransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,isdebris,issampling;
+                        bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isoceantransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslc,isesa,isdebris,issampling,isfreesurface;
                         iomodel->FindConstant(&isthermal,"md.transient.isthermal");
                         iomodel->FindConstant(&ismovingfront,"md.transient.ismovingfront");
@@ -870 +870 @@
                         iomodel->FindConstant(&ishydrology,"md.transient.ishydrology");
                         iomodel->FindConstant(&issmb,"md.transient.issmb");
+                        iomodel->FindConstant(&isfreesurface,"md.masstransport.isfreesurface");
                         iomodel->FindConstant(&isslc,"md.transient.isslc");
                         iomodel->FindConstant(&isesa,"md.transient.isesa");
@@ -888 +889 @@
                         if(ismasstransport || isgroundingline){
                                 analyses_temp[numanalyses++]=MasstransportAnalysisEnum;
+                                if(isfreesurface){
+                                        analyses_temp[numanalyses++]=FreeSurfaceBaseAnalysisEnum;
+                                        analyses_temp[numanalyses++]=FreeSurfaceTopAnalysisEnum;
+                                }
                                 int  basalforcing_model;
                                 iomodel->FindConstant(&basalforcing_model,"md.basalforcings.model");
@@ -933 +938 @@
                                 analyses_temp[numanalyses++]=ExtrudeFromBaseAnalysisEnum;
                                 analyses_temp[numanalyses++]=ExtrudeFromTopAnalysisEnum;
-                                analyses_temp[numanalyses++]=FreeSurfaceBaseAnalysisEnum;
-                                analyses_temp[numanalyses++]=FreeSurfaceTopAnalysisEnum;
                         }
                         analyses_temp[numanalyses++]=L2ProjectionBaseAnalysisEnum;