Changeset 8307

Timestamp:

05/16/11 15:50:55 (14 years ago)

Author:

seroussi

Message:

grid to nodes in miscellaneous

Location:

issm/trunk/test/Miscellaneous

Files:

• Bump/Bump.par (modified) (3 diffs)
• GJM_test1/SquareShelf.par (modified) (2 diffs)
• Regularization/Square.par (modified) (2 diffs)
• Regularization/runme.m (modified) (4 diffs)
• connectivity/Square.par (modified) (2 diffs)

issm/trunk/test/Miscellaneous/Bump/Bump.par

@@ -14 +14 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=30*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=30*ones(md.numberofnodes,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
@@ -21 +21 @@
 md.drag_q=ones(md.numberofelements,1);
 
-md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
+md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
 
 md.rheology_B=paterson(md.observed_temperature);
@@ -28 +28 @@
 %Deal with boundary conditions:
 md=SetIceSheetBC(md);
-md.spcvelocity(:,4)=zeros(md.numberofgrids,1);
-md.spcvelocity(:,5)=200*ones(md.numberofgrids,1);
+md.spcvelocity(:,4)=zeros(md.numberofnodes,1);
+md.spcvelocity(:,5)=200*ones(md.numberofnodes,1);
 
 %Parallel options

issm/trunk/test/Miscellaneous/GJM_test1/SquareShelf.par

@@ -11 +11 @@
 
 %Materials
-md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
+md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
 md.rheology_B=paterson(md.observed_temperature);
 md.rheology_n=3*ones(md.numberofelements,1);
@@ -19 +19 @@
 pos=find(md.elementoniceshelf);
 md.drag_type=2;
-md.drag_coefficient=20*ones(md.numberofgrids,1);
+md.drag_coefficient=20*ones(md.numberofnodes,1);
 md.drag_coefficient(md.elements(pos,:))=0;
 md.drag_p=ones(md.numberofelements,1);

issm/trunk/test/Miscellaneous/Regularization/Square.par

@@ -9 +9 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=30*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=30*ones(md.numberofnodes,1); %q=1.
 
 %Take care of iceshelves: no basal drag
@@ -17 +17 @@
 md.drag_q=ones(md.numberofelements,1);
 
-md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
+md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
 
 md.rheology_B=paterson(md.observed_temperature);

issm/trunk/test/Miscellaneous/Regularization/runme.m

@@ -30 +30 @@
         md.cm_jump=0.99*ones(md.nsteps,1);
         md.cm_noisedmp=0;
-        md.weights=1*ones(md.numberofgrids,1);
+        md.weights=1*ones(md.numberofnodes,1);
         md.eps_cm=NaN;
         md=solve(md,'analysis_type',DiagnosticSolutionEnum);
@@ -45 +45 @@
         md.cm_jump=0.99*ones(md.nsteps,1);
         md.cm_noisedmp=0.6*10^-9; %0.5 too small
-        md.weights=1*ones(md.numberofgrids,1);
+        md.weights=1*ones(md.numberofnodes,1);
         md.eps_cm=NaN;
         md=solve(md,'analysis_type',DiagnosticSolutionEnum);
@@ -60 +60 @@
         md.cm_jump=0.99*ones(md.nsteps,1);
         md.cm_noisedmp=5*10^-9;
-        md.weights=1*ones(md.numberofgrids,1);
+        md.weights=1*ones(md.numberofnodes,1);
         md.eps_cm=NaN;
         md=solve(md,'analysis_type',DiagnosticSolutionEnum);
@@ -75 +75 @@
         md.cm_jump=0.99*ones(md.nsteps,1);
         md.cm_noisedmp=8*10^-8;
-        md.weights=1*ones(md.numberofgrids,1);
+        md.weights=1*ones(md.numberofnodes,1);
         md.eps_cm=NaN;
         md=solve(md,'analysis_type',DiagnosticSolutionEnum);

issm/trunk/test/Miscellaneous/connectivity/Square.par

@@ -15 +15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofnodes,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
@@ -23 +23 @@
 md.viscosity_overshoot=0.3;
 
-md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
+md.observed_temperature=(273-20)*ones(md.numberofnodes,1);
 
 md.rheology_B=paterson(md.observed_temperature);