Changeset 575

Timestamp:

05/21/09 14:48:48 (16 years ago)

Author:

Mathieu Morlighem

Message:

marshall temperature and melting to initialize thermal transients runs

Location:

issm/trunk/src/c/ModelProcessorx

Files:

• CreateDataSets.cpp (modified) (1 diff)
• Model.cpp (modified) (2 diffs)
• Model.h (modified) (2 diffs)
• Thermal/CreateLoadsThermal.cpp (modified) (1 diff)

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

@@ -73 +73 @@
         else if (strcmp(model->analysis_type,"thermal")==0){
 
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"ok1\n");
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
                 CreateElementsNodesAndMaterialsThermal(pelements,pnodes,pmaterials, model,model_handle);
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"ok2\n");
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
                 CreateConstraintsThermal(pconstraints,model,model_handle);
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"ok3\n");
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
                 CreateLoadsThermal(ploads,model,model_handle);
+                PetscSynchronizedPrintf(MPI_COMM_WORLD,"ok4\n");
+                PetscSynchronizedFlush(MPI_COMM_WORLD);
+
                 CreateParametersThermal(pparameters,model,model_handle);
                                         

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

@@ -58 +58 @@
         model->vz=NULL;
         model->pressure=NULL;
+        model->temperature=NULL;
+        model->melting=NULL;
         model->elementonbed=NULL;
         model->elementonsurface=NULL;
@@ -213 +215 @@
         xfree((void**)&model->vz);
         xfree((void**)&model->pressure);
+        xfree((void**)&model->temperature);
+        xfree((void**)&model->melting);
         xfree((void**)&model->drag);
         xfree((void**)&model->p);

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

@@ -47 +47 @@
         double* vz;
         double* pressure;
+        double* temperature;
 
         /*observations: */
@@ -220 +221 @@
         void    CreateElementsNodesAndMaterialsMelting(DataSet** pelements,DataSet** pnodes, DataSet** pmaterials, Model* model,ConstDataHandle model_handle);
         void    CreateConstraintsMelting(DataSet** pconstraints,Model* model,ConstDataHandle model_handle);
-        void    CreateLoadsMelting(DataSet** ploads, Model* model, ConstDataHandle model_handle);
-        void    CreateParametersMelting(DataSet** pparameters,Model* model,ConstDataHandle model_handle);
+        void  CreateLoadsMelting(DataSet** ploads, Model* model, ConstDataHandle model_handle);
+        void  CreateParametersMelting(DataSet** pparameters,Model* model,ConstDataHandle model_handle);
 
 

issm/trunk/src/c/ModelProcessorx/Thermal/CreateLoadsThermal.cpp

@@ -85 +85 @@
 
 }
-
-