Changeset 5119

Timestamp:

08/10/10 13:29:37 (15 years ago)

Author:

Eric.Larour

Message:

Added missing name for test 434

Location:

issm/trunk/test/NightlyRun

Files:

• IdToName.m (modified) (1 diff)
• test231.m (modified) (2 diffs)
• test232.m (modified) (2 diffs)

issm/trunk/test/NightlyRun/IdToName.m

@@ -150 +150 @@
 elseif (id==431), name='SquareSheetShelfCMDragSteaP3dSerial';
 elseif (id==432), name='SquareSheetShelfCMDragSteaP3dParallel';
+elseif (id==434), name='SquareSheetShelfDiadM3dDakotaSamp';
 elseif (id==501), name='PigDiagM2dSerial';
 elseif (id==502), name='PigDiagM2dParallel';

issm/trunk/test/NightlyRun/test231.m

@@ -1 @@
-md=mesh(model,'../Exp/Square.exp','../Exp/Rifts.exp',50000);
+md=mesh(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
 md=meshprocessrifts(md,'../Exp/Square.exp');
 md=geography(md,'all','');
@@ -5 +5 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster='none';
-md.solverstring=' -mat_type aijmumps -ksp_type preonly -pc_type lu -mat_mumps_icntl_14 80 ';
+
+%solver, to handle penalties
 md=solversettoasm(md);
-error('rifts not working for now')
+%md=solversettomumps(md);
+
+%rift settings
+md.rifts.fill=MelangeEnum();
+md.rifts.fraction=0;
+md.penalty_lock=2;
+md.rifts.fractionincrement=.1;
+
 md=solve(md,'analysis_type',DiagnosticSolutionEnum);
 

issm/trunk/test/NightlyRun/test232.m

@@ -1 @@
-md=mesh(model,'../Exp/Square.exp','../Exp/Rifts.exp',50000);
+md=mesh(model,'../Exp/SquareHole.exp','../Exp/Rifts.exp',50000);
 md=meshprocessrifts(md,'../Exp/Square.exp');
 md=geography(md,'all','');
@@ -5 +5 @@
 md=setelementstype(md,'macayeal','all');
 md.cluster=oshostname();
-md.solverstring=' -mat_type aijmumps -ksp_type preonly -pc_type lu -mat_mumps_icntl_14 80 ';
+md.np=1
+
+%solver, to handle penalties
+%md=solversettoasm(md);
 md=solversettomumps(md);
-error('rifts not working for now')
+
+%rift settings
+md.rifts.fill=MelangeEnum();
+md.rifts.fraction=0;
+md.penalty_lock=2;
+md.rifts.fractionincrement=.1;
+
 md=solve(md,'analysis_type',DiagnosticSolutionEnum);