Changeset 819

Timestamp:

06/05/09 14:52:58 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed plot_overlay

Location:

issm/trunk/src

Files:

• c/GriddataMeshToGridx/GriddataMeshToGridx.cpp (modified) (8 diffs)
• m/classes/public/buildoverlay.m (modified) (1 diff)
• m/classes/public/plot/plot_overlay.m (modified) (3 diffs)
• m/classes/public/radarpower.m (modified) (1 diff)

issm/trunk/src/c/GriddataMeshToGridx/GriddataMeshToGridx.cpp

@@ -13 +13 @@
 #include "../EnumDefinitions/EnumDefinitions.h"
 
-
-
 void GriddataMeshToGridx( double** pgriddata,double*  index,int nel,double* x,double* y,int nods, Contour** contours,int numcontours,
                 double* meshdata,double cornereast,double cornernorth,double xposting,double yposting,int nlines,int ncols,
@@ -26 +24 @@
         double* griddata=NULL;
         int*    sparsity=NULL;
-        
         
         /*intermediary: */
@@ -41 +38 @@
         double*  yc=NULL;
 
-
-        
-
-
         /*First, allocate griddata: */
         griddata=(double*)xcalloc(nlines*ncols,sizeof(double));
@@ -56 +49 @@
                 maxi=nods;
         }
-        else if (interpolation==0){
+        else if (interpolation==1){
                 maxi=nel;
         }
@@ -85 +78 @@
                 if (gridi>=nlines)continue;
                 if (gridj>=ncols)continue;
-
         
                 /*printf("yi %g cornersouth %g posting %g yi-cornersouth %g gridi %i\n",yi,cornersouth,posting,yi-cornersouth,gridi);
@@ -103 +95 @@
                 /*Using this box, we add value in the box. If filter is average, we add 1 to sparsity for each member of this 
                  * box, if filter is nearest, we set 1 to sparisty for each member of this box: */
-
                 if(filter==0){
                         /*average: */
@@ -123 +114 @@
                 }
         } //for(i=0;i<maxi;i++)
-        
 
         /*Ok, now we have griddata, and sparsity. Divide griddata by sparsity: */
@@ -178 +168 @@
         }
 
-
         /*Assign output pointers: */
         *pgriddata=griddata;

issm/trunk/src/m/classes/public/buildoverlay.m

@@ -61 +61 @@
 
 md.cluster='none';
-md=solve(md,'mesh2grid','cielo');
+md=solve(md,'analysis_type','mesh2grid','package','cielo');
 
 %Ok, we have two images, double format: 

issm/trunk/src/m/classes/public/plot/plot_overlay.m

@@ -23 +23 @@
         transparency=options_structure.alpha;
 else
-        transparency=1.5; %rignot setting.
+        transparency=1.5; %Rignot setting.
 end
 
@@ -65 +65 @@
 
 %colorbar
-if ~isnan(options_structure.colorbar),
+if options_structure.colorbar,
 
         %create colorbar with correct colors and position
@@ -72 +72 @@
         colorbar_image_handle=get(colorbar_handle,'Children'); 
         set(colorbar_image_handle,'CData',colorbar_rgb);
-        set(colorbar_handle,'Position',options_structure.colorbarpos);
+        if options_structure.colorbarpos,
+                set(colorbar_handle,'Position',options_structure.colorbarpos);
+        end
 
         %modify ticks.

issm/trunk/src/m/classes/public/radarpower.m

@@ -20 +20 @@
 
 %Get path  to gdal binaries
-path_gdal=[ISSM_DIR '/Libs/gdal/install'];
+path_gdal=[ISSM_DIR '/externalpackages/gdal/install/bin/'];
 
 %Was gdal compiled? 
-if exist([path_gdal 'gdal_translate'])==0,
-        error(['radarpower error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_DIR '/Libs/gdal to use this routine.']);
+if ~exist([path_gdal 'gdal_translate']),
+        error(['radarpower error message: GDAL library needs to be compiled to use this routine. Compile GDAL in ' ISSM_DIR '/externalpackages/gdal to use this routine.']);
 end
 
 %the geotiff image is either 200m or 1km accuracy. 
 if highres,
-        geotiff_name=[MODELDATA 'MosaicTiffRsat/amm125m_v2_200m.tif'];
+        if ~exist([MODELDATA '/MosaicTiffRsat/amm125m_v2_200m.tif']),
+                error(['radarpower error message: file ' MODELDATA '/MosaicTiffRsat/amm125m_v2_200m.tif not found. Check MODELDATA variable..']);
+        end
+        geotiff_name=[MODELDATA '/MosaicTiffRsat/amm125m_v2_200m.tif'];
 else
-        geotiff_name=[MODELDATA 'MosaicTiffRsat/amm125m_v2_1km.tif'];
+        if ~exist([MODELDATA '/MosaicTiffRsat/amm125m_v2_1km.tif']),
+                error(['radarpower error message: file ' MODELDATA '/MosaicTiffRsat/amm125m_v2_1km.tif not found. Check MODELDATA variable..']);
+        end
+        geotiff_name=[MODELDATA '/MosaicTiffRsat/amm125m_v2_1km.tif'];
 end