Changeset 10538

Timestamp:

11/08/11 17:49:26 (13 years ago)

Author:

Eric.Larour

Message:

Switched stabilization to double for hydrology.
Fixed bug in loadresultsfromdisk.
stabilization now a double multiplicator to artificial diffusivity in the
hydrology capability.

Location:

issm/trunk/src

Files:

• c/objects/Elements/Tria.cpp (modified) (3 diffs)
• m/classes/hydrology.m (modified) (2 diffs)
• m/model/loadresultsfromdisk.m (modified) (1 diff)

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

@@ -4659 +4659 @@
 
         /*Intermediaries */
-        int        artdiff;
+        double     diffusivity;
         int        i,j,ig;
         double     Jdettria,DL_scalar,dt,h;
@@ -4684 +4684 @@
         GetVerticesCoordinates(&xyz_list[0][0], nodes, NUMVERTICES);
         this->parameters->FindParam(&dt,TimesteppingTimeStepEnum);
-        this->parameters->FindParam(&artdiff,HydrologyStabilizationEnum);
+        this->parameters->FindParam(&diffusivity,HydrologyStabilizationEnum);
         Input* vx_input=inputs->GetInput(HydrologyWaterVxEnum); _assert_(vx_input);
         Input* vy_input=inputs->GetInput(HydrologyWaterVyEnum); _assert_(vy_input);
@@ -4734 +4734 @@
                 /*Artificial diffusivity*/
                 vel=sqrt(pow(vx,2.)+pow(vy,2.));
-                K[0][0]=artdiff*h/(2*vel)*vx*vx;
-                K[1][0]=artdiff*h/(2*vel)*vy*vx;
-                K[0][1]=artdiff*h/(2*vel)*vx*vy;
-                K[1][1]=artdiff*h/(2*vel)*vy*vy;
+                K[0][0]=diffusivity*h/(2*vel)*vx*vx;
+                K[1][0]=diffusivity*h/(2*vel)*vy*vx;
+                K[0][1]=diffusivity*h/(2*vel)*vx*vy;
+                K[1][1]=diffusivity*h/(2*vel)*vy*vy;
                 KDL[0][0]=DL_scalar*K[0][0];
                 KDL[1][0]=DL_scalar*K[1][0];

issm/trunk/src/m/classes/hydrology.m

@@ -12 +12 @@
                 q              = modelfield('default',0,'marshall',true,'format','Double');
                 kn             = modelfield('default',0,'marshall',true,'format','Double');
-                stabilization  = modelfield('default',0,'marshall',true,'format','Integer');
+                stabilization  = modelfield('default',0,'marshall',true,'format','Double');
         end
         methods
@@ -66 +66 @@
                         fielddisplay(obj,'q','dimensionless exponent in Manning velocity formula');
                         fielddisplay(obj,'kn','parameter in effective pressure formula');
-                        fielddisplay(obj,'stabilization','artificial diffusivity (default is 1)');
+                        fielddisplay(obj,'stabilization','artificial diffusivity (default is 1). can be more than 1 to increase diffusivity.');
 
                 end % }}}

issm/trunk/src/m/model/loadresultsfromdisk.m

@@ -35 +35 @@
                 md.results.(structure(1).SolutionType)(1).outlog=char(textread([md.miscellaneous.name '.outlog'],'%s','delimiter','\n'));
         else
-                md.iresults.(structure(1).SolutionType)(1).outlog='';
+                md.results.(structure(1).SolutionType)(1).outlog='';
         end