Changeset 1864

Timestamp:

08/25/09 10:06:03 (16 years ago)

Author:

Mathieu Morlighem

Message:

moved thermalstatic to steadystate

Location:

issm/trunk/src/c

Files:

• Makefile.am (modified) (3 diffs)
• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx/IoModel.cpp (modified) (2 diffs)
• ModelProcessorx/IoModel.h (modified) (1 diff)

issm/trunk/src/c/Makefile.am

@@ -604 +604 @@
                                         ./parallel/transient_core_2d.cpp\
                                         ./parallel/transient_core_3d.cpp\
-                                        ./parallel/thermalstatic_core.cpp\
+                                        ./parallel/steadystate_core.cpp\
                                         ./parallel/OutputResults.cpp
 
@@ -612 +612 @@
 bin_PROGRAMS = 
 else 
-bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe transient.exe thermalstatic.exe
+bin_PROGRAMS = diagnostic.exe  control.exe thermal.exe prognostic.exe transient.exe steadystate.exe
 endif
 
@@ -620 +620 @@
 diagnostic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
 
-thermalstatic_exe_SOURCES = parallel/thermalstatic.cpp
-thermalstatic_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
+steadystate_exe_SOURCES = parallel/steadystate.cpp
+steadystate_exe_CXXFLAGS= -fPIC -D_PARALLEL_ 
 
 control_exe_SOURCES = parallel/control.cpp

issm/trunk/src/c/ModelProcessorx/CreateParameters.cpp

@@ -67 +67 @@
         //control: thermal static
         count++;
-        param= new Param(count,"thermalstatic",INTEGER);
-        param->SetInteger(iomodel->thermalstatic);
+        param= new Param(count,"steadystate",INTEGER);
+        param->SetInteger(iomodel->steadystate);
         parameters->AddObject(param);
 

issm/trunk/src/c/ModelProcessorx/IoModel.cpp

@@ -104 +104 @@
         /*!control methods: */
         iomodel->control_type=NULL;
-        iomodel->thermalstatic=0;
+        iomodel->steadystate=0;
 
         /*!solution parameters: */
@@ -315 +315 @@
         /*Get control parameters: */
         IoModelFetchData((void**)&iomodel->control_type,NULL,NULL,iomodel_handle,"control_type","String",NULL); 
-        IoModelFetchData((void**)&iomodel->thermalstatic,NULL,NULL,iomodel_handle,"thermalstatic","Integer",NULL); 
+        IoModelFetchData((void**)&iomodel->steadystate,NULL,NULL,iomodel_handle,"steadystate","Integer",NULL); 
 
         /*!Get solution parameters: */

issm/trunk/src/c/ModelProcessorx/IoModel.h

@@ -103 +103 @@
         /*control methods: */
         char*   control_type;
-        int     thermalstatic;
+        int     steadystate;
 
         /*solution parameters: */