Changeset 11408 for issm/trunk-jpl/src

Timestamp:

02/13/12 11:41:34 (13 years ago)

Author:

Mathieu Morlighem

Message:

Fixed collapse with new fields, very useful for MacAyeal CM

Location:

issm/trunk-jpl/src/m/model

Files:

• collapse.m (modified) (5 diffs)
• radarpower.m (modified) (1 diff)

issm/trunk-jpl/src/m/model/collapse.m

@@ -29 +29 @@
 if ~isnan(md.inversion.vy_obs), md.inversion.vy_obs=project2d(md,md.inversion.vy_obs,md.mesh.numberoflayers); end;
 if ~isnan(md.inversion.vel_obs), md.inversion.vel_obs=project2d(md,md.inversion.vel_obs,md.mesh.numberoflayers); end;
+if ~isnan(md.inversion.cost_functions_coefficients), md.inversion.cost_functions_coefficients=project2d(md,md.inversion.cost_functions_coefficients,md.mesh.numberoflayers); end;
+if ~isnan(md.inversion.min_parameters), md.inversion.min_parameters=project2d(md,md.inversion.min_parameters,md.mesh.numberoflayers); end;
+if ~isnan(md.inversion.max_parameters), md.inversion.max_parameters=project2d(md,md.inversion.max_parameters,md.mesh.numberoflayers); end;
 if ~isnan(md.surfaceforcings.mass_balance),
         md.surfaceforcings.mass_balance=project2d(md,md.surfaceforcings.mass_balance,md.mesh.numberoflayers); 
@@ -49 +52 @@
 if ~isnan(md.flowequation.element_equation)
         md.flowequation.element_equation=project2d(md,md.flowequation.element_equation,1);
+        md.flowequation.vertex_equation=project2d(md,md.flowequation.vertex_equation,1);
+        md.flowequation.bordermacayeal=project2d(md,md.flowequation.bordermacayeal,1);
+        md.flowequation.borderpattyn=project2d(md,md.flowequation.borderpattyn,1);
+        md.flowequation.borderstokes=project2d(md,md.flowequation.borderstokes,1);
 end     
 
@@ -55 +62 @@
 md.diagnostic.spcvy=project2d(md,md.diagnostic.spcvy,md.mesh.numberoflayers);
 md.diagnostic.spcvz=project2d(md,md.diagnostic.spcvz,md.mesh.numberoflayers);
+md.diagnostic.referential=project2d(md,md.diagnostic.referential,md.mesh.numberoflayers);
 md.prognostic.spcthickness=project2d(md,md.prognostic.spcthickness,md.mesh.numberoflayers);
 md.thermal.spctemperature=project2d(md,md.thermal.spctemperature,md.mesh.numberoflayers);
@@ -60 +68 @@
 %Extrusion of Neumann BC
 if ~isnan(md.diagnostic.icefront),
-        numberofneumann2d=size(md.diagnostic.icefront,1)/md.mesh.numberoflayers;
+        numberofneumann2d=size(md.diagnostic.icefront,1)/(md.mesh.numberoflayers-1);
         md.diagnostic.icefront=[md.diagnostic.icefront(1:numberofneumann2d,1:2) md.diagnostic.icefront(1:numberofneumann2d,5:6)]; %Add two columns on the first layer 
 end
@@ -88 +96 @@
 md.mask.elementongroundedice=project2d(md,md.mask.elementongroundedice,1);
 md.mask.vertexongroundedice=project2d(md,md.mask.vertexongroundedice,1);
+md.mask.elementonwater=project2d(md,md.mask.elementonwater,1);
+md.mask.vertexonwater=project2d(md,md.mask.vertexonwater,1);
 
 %Initialize with the 2d mesh

issm/trunk-jpl/src/m/model/radarpower.m

@@ -11 +11 @@
 
 %If gdal does not work, uncomment the following line
-setenv('LD_LIBRARY_PATH','/proj/ice/larour/issm/trunk/externalpackages/gdal/install/lib/');
+%setenv('LD_LIBRARY_PATH','/proj/ice/larour/issm/trunk/externalpackages/gdal/install/lib/');
 %Parse inputs
 if nargin==1,