source: issm/oecreview/Archive/11401-11425/ISSM-11407-11408.diff@ 11515

Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m    (revision 11407)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/collapse.m    (revision 11408)
@@ -28,6 +28,9 @@
 if ~isnan(md.inversion.vx_obs), md.inversion.vx_obs=project2d(md,md.inversion.vx_obs,md.mesh.numberoflayers); end;
 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); 
 end;
@@ -48,18 +51,23 @@
 %elementstype
 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    
 
 %boundary conditions
 md.diagnostic.spcvx=project2d(md,md.diagnostic.spcvx,md.mesh.numberoflayers);
 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);
 
 %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
 
@@ -87,6 +95,8 @@
 md.mask.vertexonfloatingice=project2d(md,md.mask.vertexonfloatingice,1);
 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
 md.mesh.x=md.mesh.x2d;
Index: /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m
===================================================================
--- /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m  (revision 11407)
+++ /proj/ice/larour/issm-uci-clean/trunk-jpl/src/m/model/radarpower.m  (revision 11408)
@@ -10,7 +10,7 @@
 %      md=radarpower(md)
 
 %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,
        options=pairoptions;