Changeset 10287

Timestamp:

10/25/11 09:22:38 (13 years ago)

Author:

seroussi

Message:

removed grounding line solution (use transient.isgroundingline instead)

Location:

issm/trunk/src/c

Files:

• EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• modules/StringToEnumx/StringToEnumx.cpp (modified) (1 diff)
• solutions/AnalysisConfiguration.cpp (modified) (1 diff)
• solutions/CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• solutions/groundinglinemigration2d_core.cpp (deleted)
• solutions/solutions.h (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -202 +202 @@
         //transient
         TransientSolutionEnum,
-        GroundinglineMigration2dSolutionEnum,
         //slope
         BedSlopeSolutionEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -195 +195 @@
                 case HydrologyAnalysisEnum : return "HydrologyAnalysis";
                 case TransientSolutionEnum : return "TransientSolution";
-                case GroundinglineMigration2dSolutionEnum : return "GroundinglineMigration2dSolution";
                 case BedSlopeSolutionEnum : return "BedSlopeSolution";
                 case BedSlopeAnalysisEnum : return "BedSlopeAnalysis";

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -193 +193 @@
         else if (strcmp(name,"HydrologyAnalysis")==0) return HydrologyAnalysisEnum;
         else if (strcmp(name,"TransientSolution")==0) return TransientSolutionEnum;
-        else if (strcmp(name,"GroundinglineMigration2dSolution")==0) return GroundinglineMigration2dSolutionEnum;
         else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum;
         else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum;

issm/trunk/src/c/solutions/AnalysisConfiguration.cpp

@@ -107 +107 @@
                         break;
                 
-                case GroundinglineMigration2dSolutionEnum:
-                        numanalyses=2;
-                        analyses=(int*)xmalloc(numanalyses*sizeof(int));
-                        analyses[0]=DiagnosticHorizAnalysisEnum;
-                        analyses[1]=PrognosticAnalysisEnum;
-                        break;
-
                 default:
                         _error_("%s%s%s"," solution type: ",EnumToStringx(solutiontype)," not supported yet!");

issm/trunk/src/c/solutions/CorePointerFromSolutionEnum.cpp

@@ -88 +88 @@
                         #endif
                         break;
-                case GroundinglineMigration2dSolutionEnum:
-                        #ifdef _HAVE_GROUNDINGLINE_
-                        solutioncore=&groundinglinemigration2d_core;
-                        #else
-                        _error_("ISSM was not compiled with grounding line migration capabilities. Exiting");
-                        #endif
-                        break;
                 case PrognosticSolutionEnum:
                         #ifdef _HAVE_PROGNOSTIC_

issm/trunk/src/c/solutions/solutions.h

@@ -31 +31 @@
 void steadystate_core(FemModel* femmodel);
 void transient_core(FemModel* femmodel);
-void groundinglinemigration2d_core(FemModel* femmodel);
 double objectivefunctionC(double search_scalar,OptArgs* optargs);