Changeset 19306

Timestamp:

04/23/15 11:32:06 (10 years ago)

Author:

Eric.Larour

Message:

CHG: using the right constructor.

File:

• issm/trunk-jpl/src/c/cores/controlad_core.cpp (modified) (6 diffs)

issm/trunk-jpl/src/c/cores/controlad_core.cpp

@@ -123 +123 @@
         char* toolkitsfilename=NULL;
         char* lockfilename=NULL;
+        char* restartfilename=NULL;
         int         solution_type;
         IssmDouble    pfd;
@@ -138 +139 @@
         femmodel->parameters->FindParam(&toolkitsfilename,ToolkitsFileNameEnum);
         femmodel->parameters->FindParam(&lockfilename,LockFileNameEnum);
-
-        femmodel=new FemModel(rootpath, inputfilename, outputfilename, toolkitsfilename, lockfilename, femmodel->comm, femmodel->solution_type,NULL);
+        femmodel->parameters->FindParam(&restartfilename,RestartFileNameEnum);
+
+        femmodel=new FemModel(rootpath, inputfilename, outputfilename, toolkitsfilename, lockfilename, restartfilename, femmodel->comm, femmodel->solution_type,NULL);
 
         
@@ -151 +153 @@
         xDelete<char>(toolkitsfilename);
         xDelete<char>(lockfilename);
+        xDelete<char>(restartfilename);
         xDelete<IssmDouble>(Xd);
 
@@ -241 +244 @@
         char* toolkitsfilename=NULL;
         char* lockfilename=NULL;
+        char* restartfilename=NULL;
         IssmPDouble* G2=NULL;
         int         solution_type;
@@ -263 +267 @@
         femmodel->parameters->FindParam(&toolkitsfilename,ToolkitsFileNameEnum);
         femmodel->parameters->FindParam(&lockfilename,LockFileNameEnum);
-
-        femmodelad=new FemModel(rootpath, inputfilename, outputfilename, toolkitsfilename, lockfilename, femmodel->comm, femmodel->solution_type,X);
+        femmodel->parameters->FindParam(&restartfilename,RestartFileNameEnum);
+
+        femmodelad=new FemModel(rootpath, inputfilename, outputfilename, toolkitsfilename, lockfilename, restartfilename,femmodel->comm, femmodel->solution_type,X);
         femmodel=femmodelad; //We can do this, because femmodel is being called from outside, not by reference, so we won't erase it
         
@@ -318 +323 @@
         xDelete<char>(toolkitsfilename);
         xDelete<char>(lockfilename);
+        xDelete<char>(restartfilename);
         if(femmodelad)delete femmodelad;