Changeset 5292

Timestamp:

08/16/10 16:21:17 (15 years ago)

Author:

Mathieu Morlighem

Message:

Added missing varible dhdt in BalancedThickness CG and added unit conversion for DhDt

Location:

issm/trunk/src/c/objects

Files:

• ElementResults/NodalValuesUnitConversion.cpp (modified) (1 diff)
• Elements/Tria.cpp (modified) (5 diffs)
• Loads/Numericalflux.h (modified) (1 diff)

issm/trunk/src/c/objects/ElementResults/NodalValuesUnitConversion.cpp

@@ -27 +27 @@
         /*Get scaling factor: */
         switch(enum_type){
-                case VxEnum:  scale=yts;break; //m/yr
-                case VyEnum:  scale=yts;break; //m/yr
-                case VzEnum:  scale=yts;break; //m/yr
-                case VelEnum: scale=yts;break; //m/yr
+                case VxEnum:   scale=yts;break; //m/yr
+                case VyEnum:   scale=yts;break; //m/yr
+                case VzEnum:   scale=yts;break; //m/yr
+                case VelEnum:  scale=yts;break; //m/yr
+                case DhDtEnum: scale=yts;break; //m/yr
                 case MeltingRateEnum: scale=yts;break; //m/yr
                 case MisfitEnum:      scale=pow(yts,2);break; //(m/yr)^2

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

@@ -1278 +1278 @@
                 for (i=0;i<numgrids;i++){
                         //standard gradient dJ/dki
-                        grade_g_gaussian[i]=lambda*Jdet*gauss_weight*l1l2l3[i]; 
+                        grade_g_gaussian[i]=-lambda*Jdet*gauss_weight*l1l2l3[i]; 
                 }
 
@@ -4401 +4401 @@
         double  accumulation_g;
         double  melting_g;
+        double  dhdt_g;
 
         /*inputs: */
         Input* accumulation_input=NULL;
         Input* melting_input=NULL;
+        Input* dhdt_input=NULL;
 
         /* Get node coordinates and dof list: */
@@ -4414 +4416 @@
 
         /*retrieve inputs :*/
-        accumulation_input=inputs->GetInput(AccumulationRateEnum);
-        melting_input=inputs->GetInput(MeltingRateEnum);
+        accumulation_input=inputs->GetInput(AccumulationRateEnum); ISSMASSERT(accumulation_input);
+        melting_input=inputs->GetInput(MeltingRateEnum);           ISSMASSERT(melting_input);
+        dhdt_input=inputs->GetInput(DhDtEnum);                     ISSMASSERT(dhdt_input);
         
         /* Start  looping on the number of gaussian points: */
@@ -4434 +4437 @@
                 accumulation_input->GetParameterValue(&accumulation_g, &gauss_l1l2l3[0]);
                 melting_input->GetParameterValue(&melting_g, &gauss_l1l2l3[0]);
+                dhdt_input->GetParameterValue(&dhdt_g, &gauss_l1l2l3[0]);
 
                 /* Add value into pe_g: */
-                for( i=0; i<numdof; i++) pe_g[i]+=Jdettria*gauss_weight*(accumulation_g-melting_g)*L[i];
+                for( i=0; i<numdof; i++) pe_g[i]+=Jdettria*gauss_weight*(accumulation_g-melting_g-dhdt_g)*L[i];
 
         } // for (ig=0; ig<num_gauss; ig++)
@@ -4520 +4524 @@
 
                 /* Add value into pe_g: */
-                for( i=0; i<numdof; i++) pe_g[i]+=Jdettria*gauss_weight*(accumulation_g-melting_g+dhdt_g)*L[i];
+                for( i=0; i<numdof; i++) pe_g[i]+=Jdettria*gauss_weight*(accumulation_g-melting_g-dhdt_g)*L[i];
 
         } // for (ig=0; ig<num_gauss; ig++)

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

@@ -45 +45 @@
                 /*}}}*/
                 /*Update virtual functions resolution: {{{1*/
-                void    InputUpdateFromVector(double* vector, int name, int type){ISSMERROR("Not implemented yet!");}
+                void    InputUpdateFromVector(double* vector, int name, int type){/*Do nothing*/}
                 void    InputUpdateFromVector(int* vector, int name, int type){ISSMERROR("Not implemented yet!");}
                 void    InputUpdateFromVector(bool* vector, int name, int type){ISSMERROR("Not implemented yet!");}
                 void    InputUpdateFromConstant(double constant, int name){ISSMERROR("Not implemented yet!");}
-                void    InputUpdateFromConstant(int constant, int name){ISSMERROR("Not implemented yet!");}
+                void    InputUpdateFromConstant(int constant, int name){/*Do nothing*/};
                 void    InputUpdateFromConstant(bool constant, int name){ISSMERROR("Not implemented yet!");}
                 void    InputUpdateFromSolution(double* solution){ISSMERROR("Not implemented yet!");}