Changeset 9620

Timestamp:

09/06/11 13:46:56 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added classes/radaroverlay.m

Location:

issm/trunk/src/m

Files:

• classes/constants.m (modified) (2 diffs)
• classes/model/model.m (modified) (3 diffs)
• classes/radaroverlay.m (added)
• model/modis.m (modified) (1 diff)
• model/plot/plot_overlay.m (modified) (4 diffs)
• model/plot/plot_sarpwr.m (modified) (1 diff)
• model/radarpower.m (modified) (3 diffs)

issm/trunk/src/m/classes/constants.m

@@ -1 @@
-%CONSTANTS class definition
+%RADAROVERLAY class definition
 %
 %   Usage:
-%      constants=constants();
+%      radaroverlay=radaroverlay();
 
-classdef constants
+classdef radaroverlay
         properties (SetAccess=public) 
-                g                    = modelfield('default',0,'marshall',true,'format','Double');
-                yts                  = modelfield('default',0,'marshall',true,'format','Double');
-                referencetemperature = modelfield('default',0,'marshall',true,'format','Double');
+                pwr = modelfield('default',NaN,'marshall',false);
+                x   = modelfield('default',NaN,'marshall',false);
+                y   = modelfield('default',NaN,'marshall',false);
         end
         methods
-                function obj = constants(varargin) % {{{
+                function obj = radaroverlay(varargin) % {{{
                         switch nargin
                                 case 0
@@ -34 +34 @@
                                 obj.(fieldname)=obj.(fieldname).default;
                         end
-
-                        %acceleration due to gravity (m/s^2)
-                        obj.g=9.81;
-
-                        %converstion from year to seconds
-                        obj.yts=365*24*3600;
-
-                        %the reference temperature for enthalpy model (cf Aschwanden)
-                        obj.referencetemperature=223.15;
-
                 end % }}}
         end

issm/trunk/src/m/classes/model/model.m

@@ -21 +21 @@
                  rifts     = modelfield('default',0,'marshall',true);
                  hydrology = modelfield('default',0,'marshall',true);
+                 radaroverlay = modelfield('default',0,'marshall',false);
 
                  %FIXME: all other fields should belong to other classes
@@ -214 +215 @@
                  dummy = modelfield('default',NaN,'marshall',false);
 
-                 %radar power images
-                 sarpwr = modelfield('default',NaN,'marshall',false);
-                 sarxm  = modelfield('default',NaN,'marshall',false);
-                 sarym  = modelfield('default',NaN,'marshall',false);
-
                  %qmu
                  variables                       = modelfield('default',struct(),'marshall',false);
@@ -541 +537 @@
                          md.rifts=rifts;
                          md.hydrology=hydrology;
+                         md.radaroverlay=radaroverlay;
 
                          %Materials parameters

issm/trunk/src/m/model/modis.m

@@ -26 +26 @@
 %Read in temp.tif:
 modis=double(flipud(imread('temp.tif','TIFF')));
-xm=(x0:(x1-x0)/(size(md.sarpwr,2)-1):x1);
-ym=(y0:(y1-y0)/(size(md.sarpwr,1)-1):y1);
+xm=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
+ym=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
 
 %Erase image

issm/trunk/src/m/model/plot/plot_overlay.m

@@ -28 +28 @@
 
 %radar power
-if ~any(isnan(md.sarxm)) & ~any(isnan(md.sarym)) & ~any(isnan(md.sarpwr)),
+if ~any(isnan(md.radaroverlay.x)) & ~any(isnan(md.radaroverlay.y)) & ~any(isnan(md.radaroverlay.pwr)),
         disp('plot_overlay info: the radar image held by the model is being used');
-        xlim=[min(md.sarxm) max(md.sarxm)];
-        ylim=[min(md.sarym) max(md.sarym)];
+        xlim=[min(md.radaroverlay.x) max(md.radaroverlay.x)];
+        ylim=[min(md.radaroverlay.y) max(md.radaroverlay.y)];
 else
         disp('Extracting radar image...');
@@ -43 +43 @@
 
 %InterpFromMeshToGrid
-xmin=min(md.sarxm);
-ymax=max(md.sarym);
-xspacing=(max(md.sarxm)-min(md.sarxm))/(length(md.sarxm));
-yspacing=(max(md.sarym)-min(md.sarym))/(length(md.sarym));
-nlines=length(md.sarym);
-ncols =length(md.sarxm);
+xmin=min(md.radaroverlay.x);
+ymax=max(md.radaroverlay.y);
+xspacing=(max(md.radaroverlay.x)-min(md.radaroverlay.x))/(length(md.radaroverlay.x));
+yspacing=(max(md.radaroverlay.y)-min(md.radaroverlay.y))/(length(md.radaroverlay.y));
+nlines=length(md.radaroverlay.y);
+ncols =length(md.radaroverlay.x);
 disp('Interpolating data on grid...');
 [x_m y_m data_grid]=InterpFromMeshToGrid(elements,x,y,data,xmin,ymax,xspacing,yspacing,nlines,ncols,NaN);
@@ -104 +104 @@
 s_data(data_nan)=0;
 %intensity (V)
-radar=(md.sarpwr).^(contrast);
+radar=(md.radaroverlay.pwr).^(contrast);
 v_data=radar/max(radar(:)); %use radar power as intensity
 v_data(find(~v_data))=1;
@@ -119 +119 @@
 
 %Plot: 
-imagesc(md.sarxm*getfieldvalue(options,'unit',1),md.sarym*getfieldvalue(options,'unit',1),image_rgb);set(gca,'YDir','normal');
+imagesc(md.radaroverlay.x*getfieldvalue(options,'unit',1),md.radaroverlay.y*getfieldvalue(options,'unit',1),image_rgb);set(gca,'YDir','normal');
 
 %last step: mesh overlay?

issm/trunk/src/m/model/plot/plot_sarpwr.m

@@ -18 +18 @@
 end
                                         
-imagesc(md.sarxm,md.sarym,double(md.sarpwr)),set(gca,'YDir','normal');colormap(gray);
+imagesc(md.radaroverlay.x,md.radaroverlay.y,double(md.radaroverlay.pwr)),set(gca,'YDir','normal');colormap(gray);
 
 %apply options

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

@@ -52 +52 @@
                 im=imread(jpgim);
                 im=im(firstrow:firstrow+numrows-1,firstcol:firstcol+numcols-1);
-                md.sarpwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-                md.sarxm=(xmin:(xmax-xmin)/(size(md.sarpwr,2)-1):xmax);
-                md.sarym=(ymin:(ymax-ymin)/(size(md.sarpwr,1)-1):ymax);
+                md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
+                md.radaroverlay.x=(xmin:(xmax-xmin)/(size(md.radaroverlay.pwr,2)-1):xmax);
+                md.radaroverlay.y=(ymin:(ymax-ymin)/(size(md.radaroverlay.pwr,1)-1):ymax);
 
         elseif strcmpi(md.hemisphere,'s'),
@@ -76 +76 @@
                 im=imread('temp.tif','TIFF');
                 pixelskip=max(1,ceil(posting/((x1-x0)/(size(im,2)))));
-                md.sarpwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
-                md.sarxm=(x0:(x1-x0)/(size(md.sarpwr,2)-1):x1);
-                md.sarym=(y0:(y1-y0)/(size(md.sarpwr,1)-1):y1);
+                md.radaroverlay.pwr=double(flipud(im(1:pixelskip:end,1:pixelskip:end)));
+                md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
+                md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
 
                 %Erase image
@@ -107 +107 @@
         im=imread(overlay_image);
         im=im(toplefty:toplefty+sizey,topleftx:topleftx+sizex);
-        md.sarpwr=double(flipud(im));
-        md.sarxm=(x0:(x1-x0)/(size(md.sarpwr,2)-1):x1);
-        md.sarym=(y0:(y1-y0)/(size(md.sarpwr,1)-1):y1);
+        md.radaroverlay.pwr=double(flipud(im));
+        md.radaroverlay.x=(x0:(x1-x0)/(size(md.radaroverlay.pwr,2)-1):x1);
+        md.radaroverlay.y=(y0:(y1-y0)/(size(md.radaroverlay.pwr,1)-1):y1);
 end