Changeset 9766

Timestamp:

09/11/11 11:28:37 (14 years ago)

Author:

Mathieu Morlighem

Message:

some fixes of NR

Location:

issm/trunk

Files:

• src/m/classes/groundingline.m (modified) (1 diff)
• src/m/classes/rifts.m (modified) (1 diff)
• test/NightlyRun/test1110.m (modified) (1 diff)
• test/NightlyRun/test1201.m (modified) (1 diff)
• test/NightlyRun/test1208.m (modified) (1 diff)
• test/NightlyRun/test1302.m (modified) (1 diff)
• test/NightlyRun/test1304.m (modified) (1 diff)
• test/NightlyRun/test1501.m (modified) (1 diff)
• test/NightlyRun/test1502.m (modified) (1 diff)

issm/trunk/src/m/classes/groundingline.m

@@ -59 +59 @@
                                 end
                                 pos=find(md.mask.vertexonfloatingice); 
-                                if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>tolerance),
+                                if any(md.geometry.bathymetry(pos)-md.geometry.bed(pos)>10^-9),
                                         checkmessage(['bathymetry superior to bed on floating ice !']);
                                 end

issm/trunk/src/m/classes/rifts.m

@@ -48 +48 @@
                                 end
                                 %Check that rifts are filled with proper material
-                                checkvalues(md,{'rifts.riftstruct.fill'},[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
+                                checkvalues(md,{'riftstruct.fill'},[WaterEnum() AirEnum() IceEnum() MelangeEnum()]);
                         else
                                 if ~isnans(obj.riftstruct),

issm/trunk/test/NightlyRun/test1110.m

@@ -50 +50 @@
         md.timestepping.time_step=3;
         md.timestepping.final_time=300;
-        md.output_frequency=50;
+        md.settings.output_frequency=50;
         md.prognostic.stabilization=1;
         md.diagnostic.maxiter=1;

issm/trunk/test/NightlyRun/test1201.m

@@ -37 +37 @@
 
         %solve
-        md.isdiagnostic=0;
-        md.output_frequency=500; %keep only last step
+        md.transient.isdiagnostic=0;
+        md.settings.output_frequency=500; %keep only last step
         md.verbose=verbose();
         md=solve(md,TransientSolutionEnum);

issm/trunk/test/NightlyRun/test1208.m

@@ -20 +20 @@
 %Adapt the time steps to the resolution
 md.timestepping.time_step=20;
-md.output_frequency=20;
+md.settings.output_frequency=20;
 md.timestepping.final_time=50000;
 md.prognostic.stabilization=2;

issm/trunk/test/NightlyRun/test1302.m

@@ -20 +20 @@
 %analytical results
 %d2T/dz2-w*rho_ice*c/k*dT/dz=0   T(surface)=0  T(bed)=10   => T=A exp(alpha z)+B
-alpha=0.1/md.constants.yts*md.materials.rho_ice*md.heatcapacity/md.thermalconductivity;   %alpha=w rho_ice c /k  and w=0.1m/an
+alpha=0.1/md.constants.yts*md.materials.rho_ice*md.materials.heatcapacity/md.materials.thermalconductivity;   %alpha=w rho_ice c /k  and w=0.1m/an
 A=10/(exp(alpha*(-1000))-1);    %A=T(bed)/(exp(alpha*bed)-1)  with bed=-1000 T(bed)=10
 B=-A;

issm/trunk/test/NightlyRun/test1304.m

@@ -19 +19 @@
 %the result is linear with depth and is equal to 0 on the upper surface (See BC)
 %d2T/dz2=0  -k*dT/dz(bed)=G  T(surface)=0  => T=-G/k*(z-surface)
-md.initialization.temperature=-0.1/md.thermalconductivity*(md.mesh.z-md.geometry.surface); %G=0.1 W/m2
+md.initialization.temperature=-0.1/md.materials.thermalconductivity*(md.mesh.z-md.geometry.surface); %G=0.1 W/m2
 
 %modeled  results

issm/trunk/test/NightlyRun/test1501.m

@@ -6 +6 @@
 md=setflowequation(md,'macayeal','all');
 md.cluster=generic('name',oshostname(),'np',3);
-md.isthermal=0;
+md.transient.isthermal=0;
 
 md.timestepping.time_step=1;
-md.output_frequency=1;
+md.settings.output_frequency=1;
 md.timestepping.final_time=2000;
 

issm/trunk/test/NightlyRun/test1502.m

@@ -7 +7 @@
 md=extrude(md,3,1);
 md.cluster=generic('name',oshostname(),'np',3);
-md.isthermal=0;
+md.transient.isthermal=0;
 
 md.timestepping.time_step=1;
-md.output_frequency=1;
+md.settings.output_frequency=1;
 md.timestepping.final_time=2000;