Changeset 18817

Timestamp:

11/20/14 11:57:03 (10 years ago)

Author:

srebuffi

Message:

NEW : added tests for melting rate

Location:

issm/trunk-jpl

Files:

• examples/ISMIP/CheatyRunme.m (modified) (1 diff)
• examples/SquareIceShelf/Square.par (modified) (1 diff)
• examples/SquareIceShelf/runme.m (modified) (1 diff)
• src/m/enum/CalvingCalvingrateEnum.m (deleted)
• src/m/enum/CalvingLawEnum.m (deleted)
• src/m/enum/CalvingLevermannEnum.m (deleted)
• src/m/enum/CalvingMeltingrateEnum.m (added)
• src/m/enum/CalvingRequestedOutputsEnum.m (deleted)
• src/m/enum/CalvinglevermannCoeffEnum.m (deleted)
• src/m/enum/CalvinglevermannMeltingrateEnum.m (added)
• src/m/enum/DefaultCalvingEnum.m (deleted)
• src/m/enum/EnumDefinitions.py (modified) (1 diff)
• src/m/enum/FrictionWaterLayerEnum.m (deleted)
• src/m/enum/HydrologydcEplflipLockEnum.m (deleted)
• src/m/enum/TransientIscalvingEnum.m (deleted)
• test/Archives/Archive807.nc (added)
• test/NightlyRun/test275.m (modified) (1 diff)
• test/NightlyRun/test807.m (added)
• test/NightlyRun/test807.py (added)

issm/trunk-jpl/examples/ISMIP/CheatyRunme.m

@@ -3 +3 @@
 %step 8 is specific to ISMIPF
 
-steps=[1:7];
+steps=[1:4];
 
 % parameter file to be used, choose between CheatyIsmipA.par or CheatyIsmipF.par

issm/trunk-jpl/examples/SquareIceShelf/Square.par

@@ -25 +25 @@
 md.materials.rheology_B=paterson((273-20)*ones(md.mesh.numberofvertices,1));
 md.materials.rheology_n=3*ones(md.mesh.numberofelements,1);
-md.damage.D=zeros(md.mesh.numberofvertices,1);
+md.damage.D=0.9*ones(md.mesh.numberofvertices,1);
 
 disp('      creating boundary conditions');

issm/trunk-jpl/examples/SquareIceShelf/runme.m

@@ -1 +1 @@
 md=model;
+
 md=triangle(md,'DomainOutline.exp',100000);
 md=setmask(md,'all','');
+
+md.materials=matdamageice();
 md=parameterize(md,'Square.par');
+md.initialization.vx = ones(md.mesh.numberofvertices,1);
+md.initialization.vy = 0*ones(md.mesh.numberofvertices,1);
+md.initialization.pressure = 0*ones(md.mesh.numberofvertices,1);
+md.damage.isdamage=1;
+md.damage.law=1;
+md.damage.max_damage=0.8;
+md.damage.D=0.5*ones(md.mesh.numberofvertices,1);
+%md.damage.spcdamage=NaN*ones(md.mesh.numberofvertices,1);
+md.damage.c1=1;
+md.damage.c2=1;
+md.damage.equiv_stress=0;
+md.damage.stabilization=2;
+
+%md=extrude(md,7,3);
+md.surfaceforcings.mass_balance = zeros(md.mesh.numberofvertices,1);
+md.basalforcings.groundedice_melting_rate = zeros(md.mesh.numberofvertices,1);
+md.basalforcings.floatingice_melting_rate = zeros(md.mesh.numberofvertices,1);
 md=setflowequation(md,'SSA','all');
+
+md.timestepping.start_time = 0;
+md.timestepping.final_time = 1.;
+md.timestepping.time_step  = 0.1;
+
+md.transient.isdamageevolution=1;
+md.transient.isthermal=0;
+
 md.cluster=generic('name',oshostname,'np',2);
-md=solve(md,StressbalanceSolutionEnum);
+md.stressbalance.requested_outputs={'default','DeviatoricStressxx','DeviatoricStressyy','DeviatoricStressxy'};
+%md=solve(md,StressbalanceSolutionEnum());
+md.verbose.solution = 1;
+md=solve(md,TransientSolutionEnum());

issm/trunk-jpl/src/m/enum/EnumDefinitions.py

@@ -213 +213 @@
 def CalvingLawEnum(): return StringToEnum("CalvingLaw")[0]
 def CalvingCalvingrateEnum(): return StringToEnum("CalvingCalvingrate")[0]
+def CalvingMeltingrateEnum(): return StringToEnum("CalvingMeltingrate")[0]
 def CalvingLevermannEnum(): return StringToEnum("CalvingLevermann")[0]
 def DefaultCalvingEnum(): return StringToEnum("DefaultCalving")[0]
 def CalvingRequestedOutputsEnum(): return StringToEnum("CalvingRequestedOutputs")[0]
 def CalvinglevermannCoeffEnum(): return StringToEnum("CalvinglevermannCoeff")[0]
+def CalvinglevermannMeltingrateEnum(): return StringToEnum("CalvinglevermannMeltingrate")[0]
 def CalvingratexEnum(): return StringToEnum("Calvingratex")[0]
 def CalvingrateyEnum(): return StringToEnum("Calvingratey")[0]

issm/trunk-jpl/test/NightlyRun/test275.m

@@ -16 +16 @@
 
 md.damage.requested_outputs={'default','DamageF'};
+md.transient.isdamageevolution=1;
 
 md=setflowequation(md,'SSA','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md=solve(md,DamageEvolutionSolutionEnum());
+%md=solve(md,DamageEvolutionSolutionEnum());
 
-field_names={'D','F'};
-field_tolerances={1e-13,1e-13};
-field_values={...
-                (md.results.DamageEvolutionSolution.DamageDbar),...
-                (md.results.DamageEvolutionSolution.DamageF),...
-        };
+%field_names={'D','F'};
+%field_tolerances={1e-13,1e-13};
+%field_values={...
+%               (md.results.DamageEvolutionSolution.DamageDbar),...
+%               (md.results.DamageEvolutionSolution.DamageF),...
+%       };
+md=solve(md,TransientSolutionEnum());