Index: /issm/trunk/test/Miscellaneous/Bump/Bump.par
===================================================================
--- /issm/trunk/test/Miscellaneous/Bump/Bump.par	(revision 3767)
+++ /issm/trunk/test/Miscellaneous/Bump/Bump.par	(revision 3768)
@@ -21,15 +21,15 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=30*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=30*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Miscellaneous/connectivity/Square.par
===================================================================
--- /issm/trunk/test/Miscellaneous/connectivity/Square.par	(revision 3767)
+++ /issm/trunk/test/Miscellaneous/connectivity/Square.par	(revision 3768)
@@ -15,16 +15,16 @@
 
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
 md.observed_temperature=(273-20)*ones(md.numberofgrids,1);
 
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/ControlMethods/Square.par
===================================================================
--- /issm/trunk/test/Validation/ControlMethods/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ControlMethods/Square.par	(revision 3768)
@@ -17,10 +17,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.0;
 
@@ -29,6 +29,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par
===================================================================
--- /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/EISMINT/Diagnostic1/Square.par	(revision 3768)
@@ -11,10 +11,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag-p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -22,10 +22,10 @@
 
 disp('      creating flow law paramter');
-md.B=1.7687*10^8*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
-md.melting=0*ones(md.numberofgrids,1); %0m/a
+md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
+md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
 
 disp('      boundary conditions ');
Index: /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par
===================================================================
--- /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/EISMINT/Diagnostic2/Square.par	(revision 3768)
@@ -11,10 +11,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -22,10 +22,10 @@
 
 disp('      creating flow law paramter');
-md.B=1.7687*10^8*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
-md.melting=0*ones(md.numberofgrids,1); %0m/a
+md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
+md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
 
 disp('      boundary conditions ');
Index: /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par
===================================================================
--- /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/EISMINT/MassConservation/Square.par	(revision 3768)
@@ -11,10 +11,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag-p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -23,10 +23,10 @@
 disp('      creating flow law paramter');
 %md.B=paterson(md.observed_temperature);
-md.B=1.7687*10^8*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=0.0*ones(md.numberofgrids,1); %0m/a
-md.melting=0*ones(md.numberofgrids,1); %0m/a
+md.accumulation_rate=0.0*ones(md.numberofgrids,1); %0m/a
+md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
 
 disp('      boundary conditions ');
Index: /issm/trunk/test/Validation/EISMINT/Transient/Square.par
===================================================================
--- /issm/trunk/test/Validation/EISMINT/Transient/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/EISMINT/Transient/Square.par	(revision 3768)
@@ -11,10 +11,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -22,10 +22,10 @@
 
 disp('      creating flow law paramter');
-md.B=1.7687*10^8*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=1.7687*10^8*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=0.2*ones(md.numberofgrids,1); %0.2m/a
-md.melting=0*ones(md.numberofgrids,1); %0m/a
+md.accumulation_rate=0.2*ones(md.numberofgrids,1); %0.2m/a
+md.melting_rate=0*ones(md.numberofgrids,1); %0m/a
 
 disp('      boundary conditions ');
Index: /issm/trunk/test/Validation/HydrostaticIceSheet/NoFront/Square.par
===================================================================
--- /issm/trunk/test/Validation/HydrostaticIceSheet/NoFront/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/HydrostaticIceSheet/NoFront/Square.par	(revision 3768)
@@ -12,10 +12,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -24,6 +24,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/HydrostaticIceSheet/WithFront/Square.par
===================================================================
--- /issm/trunk/test/Validation/HydrostaticIceSheet/WithFront/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/HydrostaticIceSheet/WithFront/Square.par	(revision 3768)
@@ -12,10 +12,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 md.viscosity_overshoot=0.3;
 
@@ -24,6 +24,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/ISMIP/TestA/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestA/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestA/Square.par	(revision 3768)
@@ -9,14 +9,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=6.8067*10^7*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model');
Index: /issm/trunk/test/Validation/ISMIP/TestB/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestB/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestB/Square.par	(revision 3768)
@@ -9,14 +9,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=6.8067*10^7*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/ISMIP/TestC/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestC/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestC/Square.par	(revision 3768)
@@ -9,14 +9,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
+md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)).*sin(md.y*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=6.8067*10^7*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/ISMIP/TestD/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestD/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestD/Square.par	(revision 3768)
@@ -9,14 +9,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
+md.drag_coefficient=sqrt(md.yts.*(1000+1000*sin(md.x*2*pi/max(md.x)))./(md.g*(md.rho_ice*md.thickness+md.rho_water*md.bed)));
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=6.8067*10^7*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/ISMIP/TestE/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestE/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestE/Square.par	(revision 3768)
@@ -21,14 +21,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=zeros(md.numberofgrids,1);
+md.drag_coefficient=zeros(md.numberofgrids,1);
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=6.8067*10^7*ones(md.numberofgrids,1);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.8067*10^7*ones(md.numberofgrids,1);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/ISMIP/TestF/Square.par
===================================================================
--- /issm/trunk/test/Validation/ISMIP/TestF/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ISMIP/TestF/Square.par	(revision 3768)
@@ -11,11 +11,11 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=sqrt(md.yts.*(2.140373*10^-7*1000)^(-1));
-md.p=ones(md.numberofelements,1);
-md.q=zeros(md.numberofelements,1);
+md.drag_coefficient=sqrt(md.yts.*(2.140373*10^-7*1000)^(-1));
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=zeros(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=1.4734*10^14*ones(md.numberofgrids,1);
-md.n=1*ones(md.numberofelements,1);
+md.rheology_B=1.4734*10^14*ones(md.numberofgrids,1);
+md.rheology_n=1*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model');
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/Square.par
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test1_iceshelf/Square.par	(revision 3768)
@@ -16,14 +16,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test2_icesheet/Square.par	(revision 3768)
@@ -16,14 +16,14 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=10*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=10*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par
===================================================================
--- /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/MacAyealVsPattyn/test3_icesheet_iceshelf/Square.par	(revision 3768)
@@ -12,10 +12,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -23,6 +23,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/PattynStokes/test1_iceshelf/Square.par
===================================================================
--- /issm/trunk/test/Validation/PattynStokes/test1_iceshelf/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/PattynStokes/test1_iceshelf/Square.par	(revision 3768)
@@ -13,10 +13,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -24,6 +24,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      boundary conditions for diagnostic model: ');
Index: /issm/trunk/test/Validation/PattynStokes/test2_icesheet/Square.par
===================================================================
--- /issm/trunk/test/Validation/PattynStokes/test2_icesheet/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/PattynStokes/test2_icesheet/Square.par	(revision 3768)
@@ -13,10 +13,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -24,6 +24,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/PattynStokes/test3_icesheet_iceshelf/Square.par
===================================================================
--- /issm/trunk/test/Validation/PattynStokes/test3_icesheet_iceshelf/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/PattynStokes/test3_icesheet_iceshelf/Square.par	(revision 3768)
@@ -13,10 +13,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperature');
@@ -24,6 +24,6 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/RoundIceSheet/Circ.par
===================================================================
--- /issm/trunk/test/Validation/RoundIceSheet/Circ.par	(revision 3767)
+++ /issm/trunk/test/Validation/RoundIceSheet/Circ.par	(revision 3768)
@@ -13,10 +13,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution
+md.drag_coefficient=20*ones(md.numberofgrids,1); %q=1. %no drag is specified in the analytical solution
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperatures');
@@ -24,9 +24,9 @@
 
 disp('      creating flow law paramter');
-md.B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution 
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=6.81*10^(7)*ones(md.numberofgrids,1); %to have the same B as the analytical solution 
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=0.3*ones(md.numberofgrids,1)/md.yts; %1m/a
+md.accumulation_rate=0.3*ones(md.numberofgrids,1)/md.yts; %1m/a
 
 disp('      creating velocities');
Index: /issm/trunk/test/Validation/ThermalTests/Melting/Square.par
===================================================================
--- /issm/trunk/test/Validation/ThermalTests/Melting/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ThermalTests/Melting/Square.par	(revision 3768)
@@ -18,10 +18,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperatures');
@@ -29,10 +29,10 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
-md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
+md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
+md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/ThermalTests/Simpleadvection/Square.par
===================================================================
--- /issm/trunk/test/Validation/ThermalTests/Simpleadvection/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ThermalTests/Simpleadvection/Square.par	(revision 3768)
@@ -18,10 +18,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperatures');
@@ -29,10 +29,10 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
-md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
+md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
+md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
 
 %Deal with boundary conditions:
Index: /issm/trunk/test/Validation/ThermalTests/Simpleconduction/Square.par
===================================================================
--- /issm/trunk/test/Validation/ThermalTests/Simpleconduction/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ThermalTests/Simpleconduction/Square.par	(revision 3768)
@@ -18,10 +18,10 @@
 	disp('      creating drag');
 	md.drag_type=2; %0 none 1 plastic 2 viscous
-	md.drag=200*ones(md.numberofgrids,1); %q=1.
+	md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 	%Take care of iceshelves: no basal drag
 	pos=find(md.elementoniceshelf);
-	md.drag(md.elements(pos,:))=0;
-	md.p=ones(md.numberofelements,1);
-	md.q=ones(md.numberofelements,1);
+	md.drag_coefficient(md.elements(pos,:))=0;
+	md.drag_p=ones(md.numberofelements,1);
+	md.drag_q=ones(md.numberofelements,1);
 
 	disp('      creating temperatures');
@@ -29,10 +29,10 @@
 
 	disp('      creating flow law paramter');
-	md.B=paterson(md.observed_temperature);
-	md.n=3*ones(md.numberofelements,1);
+	md.rheology_B=paterson(md.observed_temperature);
+	md.rheology_n=3*ones(md.numberofelements,1);
 	
 	disp('      creating accumulation rates');
-	md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
-	md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
+	md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
+	md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
 
 	%Deal with boundary conditions:
Index: /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/Square.par
===================================================================
--- /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/Square.par	(revision 3767)
+++ /issm/trunk/test/Validation/ThermalTests/Simplegeothermalflux/Square.par	(revision 3768)
@@ -18,10 +18,10 @@
 disp('      creating drag');
 md.drag_type=2; %0 none 1 plastic 2 viscous
-md.drag=200*ones(md.numberofgrids,1); %q=1.
+md.drag_coefficient=200*ones(md.numberofgrids,1); %q=1.
 %Take care of iceshelves: no basal drag
 pos=find(md.elementoniceshelf);
-md.drag(md.elements(pos,:))=0;
-md.p=ones(md.numberofelements,1);
-md.q=ones(md.numberofelements,1);
+md.drag_coefficient(md.elements(pos,:))=0;
+md.drag_p=ones(md.numberofelements,1);
+md.drag_q=ones(md.numberofelements,1);
 
 disp('      creating temperatures');
@@ -29,10 +29,10 @@
 
 disp('      creating flow law paramter');
-md.B=paterson(md.observed_temperature);
-md.n=3*ones(md.numberofelements,1);
+md.rheology_B=paterson(md.observed_temperature);
+md.rheology_n=3*ones(md.numberofelements,1);
 
 disp('      creating accumulation rates');
-md.accumulation=ones(md.numberofgrids,1)/md.yts; %1m/a
-md.melting=0*ones(md.numberofgrids,1)/md.yts; %1m/a
+md.accumulation_rate=ones(md.numberofgrids,1)/md.yts; %1m/a
+md.melting_rate=0*ones(md.numberofgrids,1)/md.yts; %1m/a
 
 %Deal with boundary conditions: