Changeset 2881

Timestamp:

01/21/10 10:00:29 (15 years ago)

Author:

Eric.Larour

Message:

PropagateFlagsUntilDistance: new extractor of element flags, augmented by distance.
Moved queuing scripts to queue/ directory
effectivepressure: compute effective pressure of water
misfit: compute misfit.
new multisolve routine to solve multiple models in batch mode

Location:

issm/trunk/src/m/classes/public

Files:

• BuildQueueingScript.m (deleted)
• BuildQueueingScriptGeneric.m (deleted)
• BuildQueueingScriptcosmos.m (deleted)
• BuildQueueingScriptgemini.m (deleted)
• BuildQueueingScriptgreenplanet.m (deleted)
• LaunchQueueJob.m (deleted)
• LaunchQueueJobGeneric.m (deleted)
• LaunchQueueJobcosmos.m (deleted)
• LaunchQueueJobgemini.m (deleted)
• LaunchQueueJobgreenplanet.m (deleted)
• PropagateFlagsUntilDistance.m (added)
• display/displaycontrol.m (modified) (1 diff)
• effectivepressure.m (added)
• isresultconsistent.m (modified) (1 diff)
• loadresultsfromcluster.m (modified) (2 diffs)
• marshall.m (modified) (1 diff)
• misfit.m (added)
• multisolve.m (added)
• plot/applyoptions.m (modified) (1 diff)
• radarpower.m (modified) (1 diff)
• tres.m (modified) (1 diff)

issm/trunk/src/m/classes/public/display/displaycontrol.m

@@ -26 +26 @@
         fielddisplay(md,'cm_min','absolute minimum acceptable value of the inversed parameter');
         fielddisplay(md,'cm_max','absolute maximum acceptable value of the inversed parameter');
+        fielddisplay(md,'cm_gradient','stop control method solution at gradient');
         fielddisplay(md,'meanvel','velocity scaling factor when evaluating relative or logarithmic misfit');
         fielddisplay(md,'epsvel','for relative fit, avoids misfit becoming infinity, for logarithmic fit, threshold for velocity');

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

@@ -61 +61 @@
 if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==1,
 
-        fields1={'results.diagnostic.vx','results.diagnostic.vy','results.diagnostic.vel','results.diagnostic.parameter'};
-        fields2={'results.diagnostic.vel','results.diagnostic.J'};
-
-        %check size
-        if ~testsize(md,fields1,md.numberofgrids),
-                bool=0; return
-        end
-
-        %no NAN
-        if ~testnan(md,fields1),
-                bool=0; return
-        end
-
-        %check value is real
-        if ~testreal(md,fields1),
-                bool=0; return
-        end
-
-        %check value>=0
-        if ~testpositive(md,fields2),
-                bool=0; return
-        end
-
-        %check inversed parameter
-        if ~isnan(md.cm_max),
-                if any(md.results.diagnostic.parameter>md.cm_max)
-                        disp(['''control'' result not consistent: inverse parameter is greater than ' num2str(md.cm_max)]);
-                        bool=0; return; 
-                end
-        end
-        if ~isnan(md.cm_min),
-                if any(md.results.diagnostic.parameter<md.cm_min)
-                        disp(['''control'' result not consistent: inverse parameter is smaller than ' num2str(md.cm_min)]);
-                        bool=0; return; 
-                end
-        end
-
+        if ~md.cm_gradient,
+                fields1={'results.diagnostic.vx','results.diagnostic.vy','results.diagnostic.vel','results.diagnostic.parameter'};
+                fields2={'results.diagnostic.vel','results.diagnostic.J'};
+
+                %check size
+                if ~testsize(md,fields1,md.numberofgrids),
+                        bool=0; return
+                end
+
+                %no NAN
+                if ~testnan(md,fields1),
+                        bool=0; return
+                end
+
+                %check value is real
+                if ~testreal(md,fields1),
+                        bool=0; return
+                end
+
+                %check value>=0
+                if ~testpositive(md,fields2),
+                        bool=0; return
+                end
+
+                %check inversed parameter
+                if ~isnan(md.cm_max),
+                        if any(md.results.diagnostic.parameter>md.cm_max)
+                                disp(['''control'' result not consistent: inverse parameter is greater than ' num2str(md.cm_max)]);
+                                bool=0; return; 
+                        end
+                end
+                if ~isnan(md.cm_min),
+                        if any(md.results.diagnostic.parameter<md.cm_min)
+                                disp(['''control'' result not consistent: inverse parameter is smaller than ' num2str(md.cm_min)]);
+                                bool=0; return; 
+                        end
+                end
+        else
+                fields={'results.diagnostic.gradient'};
+                %check size
+                if ~testsize(md,fields,md.numberofgrids),
+                        bool=0; return
+                end
+
+                %no NAN
+                if ~testnan(md,fields),
+                        bool=0; return
+                end
+
+                %check value is real
+                if ~testreal(md,fields),
+                        bool=0; return
+                end
+        end
 end
 

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

@@ -28 +28 @@
 %read log files onto  fields
 md.errlog=char(textread([md.name '.errlog'],'%s','delimiter','\n'));
-md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
+%md.outlog=char(textread([md.name '.outlog'],'%s','delimiter','\n'));
 
 if ~isempty(md.errlog),
@@ -42 +42 @@
 delete([md.name '.outbin']);
 
-%erase input files
-delete([md.name '.bin']);
-delete([md.name '.queue']);
+%erase input file if run was carried out on same platform.
+hostname=oshostname();
+if strcmpi(hostname,md.cluster),
+        delete([md.name '.lock']);
+        delete([md.name '.bin']);
+        delete([md.name '.queue']);
+end
 
 %post solve phase

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

@@ -119 +119 @@
 WriteData(fid,md.cm_min,'Scalar','cm_min');
 WriteData(fid,md.cm_max,'Scalar','cm_max');
+WriteData(fid,md.cm_gradient,'Integer','cm_gradient');
 WriteData(fid,md.eps_res,'Scalar','eps_res');
 WriteData(fid,md.eps_rel,'Scalar','eps_rel');

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

@@ -229 +229 @@
                 set(gcf,'Position',[1604 4 1594 1177]);
         end
+        if strcmpi(positionstring,'larour2'),
+                set(gcf,'Position',[813 226 750 623]);
+        end
+
 end
 

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

@@ -44 +44 @@
         %Read and crop file
         im=imread(jpgim);
+        save temp im geom
         im=im(toplefty:toplefty+sizey,topleftx:topleftx+sizex);
         md.sarpwr=double(flipud(im));

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

@@ -22 +22 @@
         if isfield(md.results.diagnostic,'vz'),
                 md.vz=md.results.diagnostic.vz;
+        else
+                md.vz=zeros(md.numberofgrids,1);
         end
         md.vel=md.results.diagnostic.vel;