Changeset 3567 for issm/trunk/src/c/parallel/transient.cpp

Timestamp:

04/19/10 09:49:52 (15 years ago)

Author:

Mathieu Morlighem

Message:

all enums are now C Enums, no need to provide a number: the numbering is done automatically

File:

• issm/trunk/src/c/parallel/transient.cpp (modified) (6 diffs)

issm/trunk/src/c/parallel/transient.cpp

@@ -76 +76 @@
         _printf_("read and create finite element model:\n");
         _printf_("\n   reading diagnostic horiz model data:\n");
-        model->AddFormulation(fid,DiagnosticAnalysisEnum(),HorizAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum,HorizAnalysisEnum);
 
         _printf_("\n   reading diagnostic vert model data:\n");
-        model->AddFormulation(fid,DiagnosticAnalysisEnum(),VertAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum,VertAnalysisEnum);
         
         _printf_("\n   reading diagnostic stokes model data:\n");
-        model->AddFormulation(fid,DiagnosticAnalysisEnum(),StokesAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum,StokesAnalysisEnum);
         
         _printf_("\n   reading diagnostic hutter model data:\n");
-        model->AddFormulation(fid,DiagnosticAnalysisEnum(),HutterAnalysisEnum());
+        model->AddFormulation(fid,DiagnosticAnalysisEnum,HutterAnalysisEnum);
         
         _printf_("\n   reading surface and bed slope computation model data:\n");
-        model->AddFormulation(fid,SlopecomputeAnalysisEnum());
+        model->AddFormulation(fid,SlopecomputeAnalysisEnum);
 
         _printf_("\n   reading prognositc model data:\n");
-        model->AddFormulation(fid,PrognosticAnalysisEnum());
+        model->AddFormulation(fid,PrognosticAnalysisEnum);
         
         /*Do we run in 3d?, in which case we need thermal and melting also:*/
@@ -97 +97 @@
         if(dim==3){
                 _printf_("read and create thermal finite element model:\n");
-                model->AddFormulation(fid,ThermalAnalysisEnum(),TransientAnalysisEnum());
+                model->AddFormulation(fid,ThermalAnalysisEnum,TransientAnalysisEnum);
                 _printf_("read and create melting finite element model:\n");
-                model->AddFormulation(fid,MeltingAnalysisEnum(),TransientAnalysisEnum());
+                model->AddFormulation(fid,MeltingAnalysisEnum,TransientAnalysisEnum);
         }
 
@@ -107 +107 @@
 
         _printf_("initialize inputs:\n");
-        model->FindParam(&u_g,NULL,NULL,"u_g",PrognosticAnalysisEnum());
-        model->FindParam(&m_g,NULL,NULL,"m_g",PrognosticAnalysisEnum());
-        model->FindParam(&a_g,NULL,NULL,"a_g",PrognosticAnalysisEnum());
+        model->FindParam(&u_g,NULL,NULL,"u_g",PrognosticAnalysisEnum);
+        model->FindParam(&m_g,NULL,NULL,"m_g",PrognosticAnalysisEnum);
+        model->FindParam(&a_g,NULL,NULL,"a_g",PrognosticAnalysisEnum);
         model->FindParam(&numberofnodes,"numberofnodes");
         model->FindParam(&dt,"dt");
@@ -122 +122 @@
         
         _printf_("initialize results:\n");
-        results=new DataSet(ResultsEnum());
+        results=new DataSet(ResultsEnum);
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
 
@@ -139 +139 @@
 
                 _printf_("process results:\n");
-                ProcessResults(&processed_results,results,model,TransientAnalysisEnum());
+                ProcessResults(&processed_results,results,model,TransientAnalysisEnum);
                 
                 _printf_("write results to disk:\n");
@@ -150 +150 @@
                 #ifdef _HAVE_DAKOTA_ 
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                Qmux(model,inputs,TransientAnalysisEnum(),NoneAnalysisEnum());
+                Qmux(model,inputs,TransientAnalysisEnum,NoneAnalysisEnum);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
                 #else