Changeset 3567 for issm/trunk/src/c/parallel/prognostic.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/prognostic.cpp (modified) (5 diffs)

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

@@ -74 +74 @@
 
         _printf_("read and create finite element model:\n");
-        model->AddFormulation(fid,PrognosticAnalysisEnum());
+        model->AddFormulation(fid,PrognosticAnalysisEnum);
 
         /*recover parameters: */
@@ -82 +82 @@
         _printf_("initialize inputs:\n");
         
-        model->FindParam(&u_g_serial,NULL,NULL,"u_g",PrognosticAnalysisEnum());
-        model->FindParam(&h_g_initial,NULL,NULL,"h_g",PrognosticAnalysisEnum());
-        model->FindParam(&melting_g,NULL,NULL,"m_g",PrognosticAnalysisEnum());
-        model->FindParam(&accumulation_g,NULL,NULL,"a_g",PrognosticAnalysisEnum());
+        model->FindParam(&u_g_serial,NULL,NULL,"u_g",PrognosticAnalysisEnum);
+        model->FindParam(&h_g_initial,NULL,NULL,"h_g",PrognosticAnalysisEnum);
+        model->FindParam(&melting_g,NULL,NULL,"m_g",PrognosticAnalysisEnum);
+        model->FindParam(&accumulation_g,NULL,NULL,"a_g",PrognosticAnalysisEnum);
         model->FindParam(&dt,"dt");
         model->FindParam(&yts,"yts");
@@ -98 +98 @@
 
         _printf_("initialize results:\n");
-        results=new DataSet(ResultsEnum());
+        results=new DataSet(ResultsEnum);
         MPI_Barrier(MPI_COMM_WORLD); finish_init=MPI_Wtime();
 
@@ -118 +118 @@
                 #ifdef _HAVE_DAKOTA_ 
                 MPI_Barrier(MPI_COMM_WORLD); start_core=MPI_Wtime( );
-                Qmux(model,inputs,PrognosticAnalysisEnum(),NoneAnalysisEnum());
+                Qmux(model,inputs,PrognosticAnalysisEnum,NoneAnalysisEnum);
                 MPI_Barrier(MPI_COMM_WORLD); finish_core=MPI_Wtime( );
                 #else
@@ -130 +130 @@
         
         _printf_("process results:\n");
-        ProcessResults(&processedresults,results,model,PrognosticAnalysisEnum());
+        ProcessResults(&processedresults,results,model,PrognosticAnalysisEnum);
         
         _printf_("write results to disk:\n");