Changeset 4991

Timestamp:

08/04/10 16:39:05 (15 years ago)

Author:

seroussi

Message:

added tests on Pig

Location:

issm/trunk/test

Files:

• Data/79North.data (modified) ( previous)
• Exp/Pig.exp (modified) (1 diff)
• NightlyRun/test501.m (added)
• NightlyRun/test501_nightly.m (added)
• NightlyRun/test502.m (added)
• NightlyRun/test502_nightly.m (added)
• NightlyRun/test503.m (added)
• NightlyRun/test503_nightly.m (added)
• NightlyRun/test504.m (added)
• NightlyRun/test504_nightly.m (added)
• NightlyRun/test505.m (added)
• NightlyRun/test505_nightly.m (added)
• NightlyRun/test506.m (added)
• NightlyRun/test506_nightly.m (added)
• NightlyRun/test507.m (added)
• NightlyRun/test507_nightly.m (added)
• NightlyRun/test508.m (added)
• NightlyRun/test508_nightly.m (added)
• NightlyRun/test509.m (added)
• NightlyRun/test509_nightly.m (added)
• NightlyRun/test510.m (added)
• NightlyRun/test510_nightly.m (added)
• NightlyRun/test511.m (added)
• NightlyRun/test511_nightly.m (added)
• NightlyRun/test512.m (added)
• NightlyRun/test512_nightly.m (added)
• NightlyRun/test513.m (added)
• NightlyRun/test513_nightly.m (added)
• NightlyRun/test514.m (added)
• NightlyRun/test514_nightly.m (added)
• Par/79North.par (modified) (2 diffs)
• Par/Pig.par (modified) (3 diffs)

issm/trunk/test/Exp/Pig.exp

@@ -1 +1 @@
 ## Name:DomainTest
 ## Icon:0
-# Points Count  Value
-26 1.000000
+# Points Count Value
+28 1.000000
 # X pos Y pos
--1622169.986621 58942.495127
--1791915.043853 -152199.394686
--1714317.303404 -226978.813994
--1728866.879738 -334016.022024
--1712700.683812 -350144.916385
--1690068.009514 -338414.811395
--1656118.998067 -358942.495127
--1644802.660919 -335482.285148
--1631869.704177 -323752.180158
--1596304.073138 -328150.969529
--1586604.355582 -367740.073869
--1429792.255091 -360408.758250
--1390993.384867 -266567.918334
--1344111.416679 -319353.390787
--1400693.102423 -326684.706405
--1405542.961201 -358942.495127
--1195382.414152 -347212.390137
--1365127.471384 -111144.027222
--1429792.255091 -83285.027872
--1408776.200387 -45162.186656
--1479907.462465 56009.968879
--1513856.473911 4690.759550
--1523556.191467 14954.601416
--1507389.995540 38414.811395
--1523556.191467 61875.021374
--1622169.986621 58942.495127
+-1622169.9866210001 58942.4951270000
+-1791915.0438530000 -152199.3946860000
+-1714317.3034039999 -226978.8139940000
+-1728866.8797380000 -334016.0220240000
+-1712700.6838120001 -350144.9163850000
+-1690068.0095140000 -338414.8113950000
+-1656118.9980669999 -358942.4951270000
+-1648551.0019414744 -341770.2494588014
+-1644802.6609189999 -335482.2851480000
+-1631869.7041770001 -323752.1801580000
+-1614375.9201419884 -323220.3748800881
+-1596304.0731380000 -328150.9695290000
+-1586604.3555820000 -367740.0738690000
+-1429792.2550910001 -360408.7582500000
+-1390993.3848669999 -266567.9183340000
+-1344111.4166790000 -319353.3907870000
+-1400693.1024229999 -326684.7064050000
+-1405542.9612010000 -358942.4951270000
+-1195382.4141520001 -347212.3901370000
+-1365127.4713840000 -111144.0272220000
+-1429792.2550910001 -83285.0278720000
+-1408776.2003870001 -45162.1866560000
+-1479907.4624650001 56009.9688790000
+-1513856.4739110000 4690.7595500000
+-1523556.1914669999 14954.6014160000
+-1507389.9955400000 38414.8113950000
+-1523556.1914669999 61875.0213740000
+-1622169.9866210001 58942.4951270000
 

issm/trunk/test/Par/79North.par

@@ -23 +23 @@
 md.drag_q=ones(md.numberofelements,1);
 
-%Ice shelf melting
+%Ice shelf melting and accumulation
 md.melting_rate=zeros(md.numberofgrids,1);
 pos=find(md.gridoniceshelf);
 md.melting_rate(pos)=10;
+md.accumulation_rate=15*ones(md.numberofgrids,1);
 
 %Numerical parameters
@@ -34 +35 @@
 md.waitonlock=30;
 md.np=3;
+md.dt=1;
+md.ndt=3;
 md.eps_res=0.05;
 md.eps_rel=0.005;

issm/trunk/test/Par/Pig.par

@@ -9 +9 @@
 md.bed=md.surface-md.thickness;
 clear surface thickness vx_obs vy_obs x y index;
+md.vx=md.vx_obs;
+md.vy=md.vy_obs;
+md.vz=zeros(md.numberofgrids,1);
+md.pressure=zeros(md.numberofgrids,1);
 
 %Materials
@@ -14 +18 @@
 md.rheology_B=paterson(md.observed_temperature);
 md.rheology_n=3*ones(md.numberofelements,1);
+md.temperature=md.observed_temperature;
 
 %Friction
@@ -29 +34 @@
 md.waitonlock=30;
 md.np=3;
+md.dt=1;
+md.ndt=2;
 md.eps_res=0.05;
-md.eps_rel=0.005;
+md.eps_rel=0.05;
 md.eps_abs=NaN;