Changeset 19032

Timestamp:

01/22/15 14:09:12 (10 years ago)

Author:

bdef

Message:

BUG: fixing time dependance of the transfer

Location:

issm/trunk-jpl/src/c/analyses

Files:

• HydrologyDCEfficientAnalysis.cpp (modified) (4 diffs)
• HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -231 +231 @@
                                                 &Ke->values[0],1);
                         
+                        
                         /*Transfer EPL part*/
                         transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,sed_head_input,epl_head_input,thick_input,base_input);
-                        D_scalar=transfer*gauss->weight*Jdet;
+                        D_scalar=dt*transfer*gauss->weight*Jdet;
                         TripleMultiply(basis,numnodes,1,0,
                                                                                  &D_scalar,1,1,0,
@@ -328 +329 @@
                         /*Dealing with the epl part of the transfer term*/
                         transfer=GetHydrologyPVectorTransfer(basalelement,gauss,sed_head_input,epl_head_input,thick_input,base_input);
-                        scalar = Jdet*gauss->weight*((water_head*epl_specificstoring*epl_thickness)+(transfer));
+                        scalar = Jdet*gauss->weight*((water_head*epl_specificstoring*epl_thickness)+(dt*transfer));
                         for(int i=0;i<numnodes;i++)pe->values[i]+=scalar*basis[i];
                 }
@@ -538 +539 @@
                 switch(domaintype){
                 case Domain2DhorizontalEnum:
-                        if(!element->IsOnBase()) return;                        
+                        if(!element->IsOnBase()) return;        
                         B = element->GetMaterialParameter(MaterialsRheologyBbarEnum);
                         break;
@@ -597 +598 @@
                                 
                                 /*And proceed to the real thing*/
-                                thickness[i] = old_thickness[i]*(1+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2-2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n)));
+                                thickness[i] = old_thickness[i]*(1.0+((rho_water*gravity*dt)/(rho_ice*latentheat))*epl_conductivity*EPLgrad2-
+                                                                                                                                                                 (2.0*(A*dt/(pow(n,n)))*(pow(EPL_N,n))));
                                 
                                 /*Take care of otherthikening*/

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -251 +251 @@
                                         transfer=GetHydrologyKMatrixTransfer(basalelement,gauss,sed_head_input,epl_head_input,thick_input,base_input);
                                         basalelement->NodalFunctions(&basis[0],gauss);
-                                        D_scalar=transfer*gauss->weight*Jdet;
+                                        D_scalar=dt*transfer*gauss->weight*Jdet;
                                         TripleMultiply(basis,numnodes,1,0,
                                                                                                  &D_scalar,1,1,0,
@@ -353 +353 @@
                                         transfer=0.0;
                                 }
-                                scalar = Jdet*gauss->weight*((water_head*sediment_storing)+(transfer));
+                                scalar = Jdet*gauss->weight*((water_head*sediment_storing)+(dt*transfer));
                                 for(int i=0;i<numnodes;i++)pe->values[i]+=scalar*basis[i];
                         }