Changeset 12330 for issm/trunk/src/c/objects/FemModel.cpp

Timestamp:

06/01/12 17:26:03 (13 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 12326M

File:

• issm/trunk/src/c/objects/FemModel.cpp (modified) (2 diffs)

issm/trunk/src/c/objects/FemModel.cpp

@@ -22 +22 @@
 /*FUNCTION FemModel::constructor {{{1*/
 FemModel::FemModel(char* inputfilename, char* outputfilename, const int in_solution_type,const int* analyses,const int nummodels){
-#ifdef _PARALLEL_
 
         /*intermediary*/
@@ -75 +74 @@
         /*Add output file name to parameters: */
         this->parameters->AddObject(new StringParam(OutputfilenameEnum,outputfilename));
-
-#endif
 
 }