Changeset 19138 for issm/trunk-jpl/src/c/classes/IoModel.cpp

Timestamp:

02/20/15 10:02:35 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: allow spc temperatures to be reset by PDD scheme

File:

• issm/trunk-jpl/src/c/classes/IoModel.cpp (modified) (13 diffs)

issm/trunk-jpl/src/c/classes/IoModel.cpp

@@ -21 +21 @@
 IoModel::IoModel(){/*{{{*/
         this->fid=NULL;
+        this->solution_enum=-1;
         this->data=NULL;
         this->independents=NULL;
@@ -50 +51 @@
 }
 /*}}}*/
-IoModel::IoModel(FILE* iomodel_handle,bool trace,IssmPDouble* X){/*{{{*/
+IoModel::IoModel(FILE* iomodel_handle,int solution_enum_in,bool trace,IssmPDouble* X){/*{{{*/
 
         bool autodiff=false;
@@ -60 +61 @@
         /*Check that Enums are Synchronized*/
         this->CheckEnumSync();
+
+        /*Keep track of solution*/
+        this->solution_enum = solution_enum_in;
 
         /*Initialize data: */
@@ -240 +244 @@
 }
 /*}}}*/
-void IoModel::Constant(bool* poutput,int constant_enum){/*{{{*/
+void  IoModel::Constant(bool* poutput,int constant_enum){/*{{{*/
 
         _assert_(constant_enum>=0);
@@ -248 +252 @@
 }
 /*}}}*/
-void IoModel::Constant(int* poutput,int constant_enum){/*{{{*/
+void  IoModel::Constant(int* poutput,int constant_enum){/*{{{*/
 
         _assert_(constant_enum>=0);
@@ -256 +260 @@
 }
 /*}}}*/
-void IoModel::Constant(IssmDouble* poutput,int constant_enum){/*{{{*/
+void  IoModel::Constant(IssmDouble* poutput,int constant_enum){/*{{{*/
 
         _assert_(constant_enum>=0);
@@ -264 +268 @@
 }
 /*}}}*/
-void IoModel::Constant(char** poutput,int constant_enum){/*{{{*/
+void  IoModel::Constant(char** poutput,int constant_enum){/*{{{*/
 
         _assert_(constant_enum>=0);
@@ -291 +295 @@
 }
 /*}}}*/
-void IoModel::StartTrace(bool trace){/*{{{*/
+void  IoModel::StartTrace(bool trace){/*{{{*/
 
         bool autodiff = false;
@@ -331 +335 @@
 }
 /*}}}*/
-void IoModel::DeclareIndependents(bool trace,IssmPDouble* X){/*{{{*/
+void  IoModel::DeclareIndependents(bool trace,IssmPDouble* X){/*{{{*/
 
         int  i;
@@ -1516 +1520 @@
 }
 /*}}}*/
-void IoModel::FetchDataToInput(Elements* elements,int vector_enum,IssmDouble default_value){/*{{{*/
+void  IoModel::FetchDataToInput(Elements* elements,int vector_enum,IssmDouble default_value){/*{{{*/
 
         /*intermediary: */
@@ -1541 +1545 @@
 }
 /*}}}*/
-void IoModel::FetchDataToInput(Elements* elements,int vector_enum){/*{{{*/
+void  IoModel::FetchDataToInput(Elements* elements,int vector_enum){/*{{{*/
 
         /*intermediary: */
@@ -1613 +1617 @@
 }
 /*}}}*/
-void IoModel::LastIndex(int *pindex){/*{{{*/
+void  IoModel::LastIndex(int *pindex){/*{{{*/
 
         int my_rank;
@@ -1649 +1653 @@
 }
 /*}}}*/
-/*FUNCTION IoModel::SetFilePointerToData{{{*/
-FILE* IoModel::SetFilePointerToData(int* pcode,int* pvector_type, int data_enum){
+FILE* IoModel::SetFilePointerToData(int* pcode,int* pvector_type, int data_enum){/*{{{*/
 
         int my_rank;