Changeset 5322

Timestamp:

08/17/10 15:30:49 (15 years ago)

Author:

Mathieu Morlighem

Message:

Enabled CM dhdt for Discontinuous Galerkin and dhdt is assumed to be in m/yr in iomodel

Location:

issm/trunk/src/c/objects

Files:

• Elements/Penta.cpp (modified) (1 diff)
• Elements/Tria.cpp (modified) (1 diff)
• Loads/Numericalflux.cpp (modified) (3 diffs)
• Loads/Numericalflux.h (modified) (1 diff)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -2088 +2088 @@
         }
         if (iomodel->dhdt) {
-                for(i=0;i<6;i++)nodeinputs[i]=iomodel->dhdt[penta_vertex_ids[i]-1];
+                for(i=0;i<6;i++)nodeinputs[i]=iomodel->dhdt[penta_vertex_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new PentaVertexInput(DhDtEnum,nodeinputs));
         }

issm/trunk/src/c/objects/Elements/Tria.cpp

@@ -2877 +2877 @@
         }
         if (iomodel->dhdt) {
-                for(i=0;i<3;i++)nodeinputs[i]=iomodel->dhdt[tria_vertex_ids[i]-1];
+                for(i=0;i<3;i++)nodeinputs[i]=iomodel->dhdt[tria_vertex_ids[i]-1]/iomodel->yts;
                 this->inputs->AddInput(new TriaVertexInput(DhDtEnum,nodeinputs));
         }

issm/trunk/src/c/objects/Loads/Numericalflux.cpp

@@ -412 +412 @@
                 parameters->FindParam(&dt,DtEnum);
         }
-        else if (analysis_type==BalancedthicknessAnalysisEnum){
+        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
                 /*No transient term is involved*/
                 dt=1;
         }
         else{
-                ISSMERROR("analysis_type %i not supported yet");
+                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
         }
 
@@ -544 +544 @@
                 parameters->FindParam(&dt,DtEnum);
         }
-        else if (analysis_type==BalancedthicknessAnalysisEnum){
+        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
                 /*No transient term is involved*/
                 dt=1;
         }
         else{
-                ISSMERROR("analysis_type %i not supported yet");
+                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
         }
         
@@ -686 +686 @@
                 parameters->FindParam(&dt,DtEnum);
         }
-        else if (analysis_type==BalancedthicknessAnalysisEnum){
+        else if (analysis_type==BalancedthicknessAnalysisEnum || analysis_type==AdjointBalancedthicknessAnalysisEnum){
                 /*No transient term is involved*/
                 dt=1;
         }
         else{
-                ISSMERROR("analysis_type %i not supported yet");
+                ISSMERROR("analysis_type %s not supported yet",EnumToString(analysis_type));
         }
         

issm/trunk/src/c/objects/Loads/Numericalflux.h

@@ -51 +51 @@
                 void    InputUpdateFromVectorDakota(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
                 void    InputUpdateFromVectorDakota(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
-                void    InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
+                void    InputUpdateFromConstant(double constant, int name){/*Do nothing*/};
                 void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};
                 void    InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}