Changeset 13696

Timestamp:

10/16/12 11:09:05 (12 years ago)

Author:

Eric.Larour

Message:

DEL: moved TimeAdaptx to FemModel method.

Location:

issm/trunk-jpl/src/c

Files:

• Makefile.am (modified) (1 diff)
• classes/FemModel.cpp (modified) (4 diffs)
• classes/FemModel.h (modified) (1 diff)
• modules/TimeAdaptx (deleted)
• modules/modules.h (modified) (1 diff)
• solutions/transient_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/Makefile.am

@@ -288 +288 @@
                                         ./modules/InputArtificialNoisex/InputArtificialNoisex.h\
                                         ./modules/InputArtificialNoisex/InputArtificialNoisex.cpp\
-                                        ./modules/TimeAdaptx/TimeAdaptx.h\
-                                        ./modules/TimeAdaptx/TimeAdaptx.cpp\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.h\
                                         ./modules/ConfigureObjectsx/ConfigureObjectsx.cpp\

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

@@ -38 +38 @@
         this->comm=incomm;
         this->SetStaticComm();
-
-        /*Print starting banner:*/
-        this->PrintBanner();
 
         /*Start profiler: */
@@ -329 +326 @@
 
 /*Modules:*/
-/*FUNCTION FemModel::UpdateVertexPositionsx(void){{{*/
-int FemModel::UpdateVertexPositionsx(void){
+int FemModel::UpdateVertexPositionsx(void){ /*{{{*/
 
         int     i;
@@ -364 +360 @@
 }
 /*}}}*/
-/*FUNCTION void FemModel::UpdateConstraintsx(void){{{*/
-void FemModel::UpdateConstraintsx(void){
+void FemModel::UpdateConstraintsx(void){ /*{{{*/
 
         IssmDouble time;
@@ -384 +379 @@
 
 }
+/*}}}*/
+void FemModel::TimeAdaptx(IssmDouble* pdt){/*{{{*/
+
+        int      i;
+
+        /*output: */
+        IssmDouble   dt;
+
+        /*intermediary: */
+        Element *element     = NULL;
+        IssmDouble   min_dt      = 0;
+        IssmDouble   node_min_dt = 0;
+
+        /*Go through elements, and figure out the minimum of the time steps for each element (using CFL criterion): */
+        element=(Element*)elements->GetObjectByOffset(0); min_dt=element->TimeAdapt();
+
+        for (i=1;i<elements->Size();i++){
+                element=(Element*)elements->GetObjectByOffset(i);
+                dt=element->TimeAdapt();
+                if(dt<min_dt)min_dt=dt;
+        }
+
+        /*Figure out minimum across the cluster: */
+        #ifdef _HAVE_MPI_
+        MPI_Reduce (&min_dt,&node_min_dt,1,MPI_DOUBLE,MPI_MIN,0,IssmComm::GetComm() );
+        MPI_Bcast(&node_min_dt,1,MPI_DOUBLE,0,IssmComm::GetComm());
+        min_dt=node_min_dt;
+        #endif
+
+        /*Assign output pointers:*/
+        *pdt=min_dt;
+}
+/*}}}*/

issm/trunk-jpl/src/c/classes/FemModel.h

@@ -65 +65 @@
                 int UpdateVertexPositionsx(void);
                 void UpdateConstraintsx(void);
+                void TimeAdaptx(IssmDouble* pdt);
                 /*}}}*/
 

issm/trunk-jpl/src/c/modules/modules.h

@@ -113 +113 @@
 #include "./SystemMatricesx/SystemMatricesx.h"
 #include "./CreateJacobianMatrixx/CreateJacobianMatrixx.h"
-#include "./TimeAdaptx/TimeAdaptx.h"
 #include "./TriaSearchx/TriaSearchx.h"
 #include "./TriMeshx/TriMeshx.h"

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -78 +78 @@
                 /*Increment*/
                 if(time_adapt){
-                        TimeAdaptx(&dt,femmodel->elements, femmodel->nodes,femmodel->vertices,femmodel->loads, femmodel->materials, femmodel->parameters); 
+                        femmodel->TimeAdaptx(&dt);
                         if(time+dt>finaltime) dt=finaltime-time;
                         femmodel->parameters->SetParam(dt,TimesteppingTimeStepEnum);