Changeset 7307

Timestamp:

02/03/11 16:17:54 (14 years ago)

Author:

Eric.Larour

Message:

Added GroundingLineMigration solution.

Location:

issm/trunk/src/c/solutions

Files:

• CorePointerFromSolutionEnum.cpp (modified) (1 diff)
• SolutionConfiguration.cpp (modified) (1 diff)
• groundinglinemigration2d_core.cpp (added)
• issm.cpp (modified) (1 diff)
• solutions.h (modified) (1 diff)

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

@@ -55 +55 @@
                         solutioncore=&transient3d_core;
                         break;
+                case GroundingLineMigration2DSolutionEnum:
+                        solutioncore=&groundinglinemigration2d_core;
+                        break;
+
                 default:
                         _error_("%s%s%s"," solution type: ",EnumToString(solutiontype)," not supported yet!");

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

@@ -114 +114 @@
                         analyses[7]=MeltingAnalysisEnum;
                         break;
+                
+                case GroundingLineMigration2DSolutionEnum:
+                        numanalyses=2;
+                        analyses=(int*)xmalloc(numanalyses*sizeof(int));
+                        analyses[0]=DiagnosticHorizAnalysisEnum;
+                        analyses[1]=PrognosticAnalysisEnum;
+                        break;
 
                 default:

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

@@ -52 +52 @@
         petscoptionsfilename=argv[4];
         lockname=argv[6];
+
 
         MPI_Barrier(MPI_COMM_WORLD); start_init=MPI_Wtime();

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

@@ -29 +29 @@
 void transient2d_core(FemModel* femmodel);
 void transient3d_core(FemModel* femmodel);
+void groundinglinemigration2d_core(FemModel* femmodel);
 double objectivefunctionC(double search_scalar,OptArgs* optargs);