Changeset 9604

Timestamp:

09/06/11 09:22:35 (14 years ago)

Author:

seroussi

Message:

removed md.counter

Location:

issm/trunk/src/m

Files:

• classes/clusters/pfe.m (modified) (1 diff)
• classes/model/model.m (modified) (1 diff)
• model/mesh/mesh.m (modified) (1 diff)
• model/plot/plot_overlay.m (modified) (1 diff)
• utils/Mesh/squaremesh.m (modified) (1 diff)

issm/trunk/src/m/classes/clusters/pfe.m

@@ -67 +67 @@
                  function IsConsistent(cluster) % {{{1
 
-                         available_queues={'long'};
-                         queue_requirements_time=[7200];
-                         queue_requirements_np=[2048];
+                         available_queues={'long','debug'};
+                         queue_requirements_time=[7200 120];
+                         queue_requirements_np=[2048 150];
 
                          QueueRequirements(available_queues,queue_requirements_time,queue_requirements_np,cluster.queue,cluster.np,cluster.time)

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

@@ -21 +21 @@
                  name            = modelfield('default','','marshall',true,'format','String');
                  runtimename     = modelfield('default','','marshall',false); %name used when running a parallel job
-                 counter         = modelfield('default',0,'marshall',false);
 
                  %Mesh

issm/trunk/src/m/model/mesh/mesh.m

@@ -27 +27 @@
 
 %Check that mesh was not already run, and warn user: 
-if subsref(md,struct('type','.','subs','counter'))>=1,
+if md.numberofelements~=0,
         choice=input('This model already has a mesh. Are you sure you want to go ahead? (y/n)','s');
         if ~strcmp(choice,'y')

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

@@ -106 +106 @@
 radar=(md.sarpwr).^(contrast);
 v_data=radar/max(radar(:)); %use radar power as intensity
+v_data(find(~v_data))=1;
 
 %Transform HSV to RGB

issm/trunk/src/m/utils/Mesh/squaremesh.m

@@ -19 +19 @@
 x=zeros(nx*ny,1);
 y=zeros(nx*ny,1);
-counter=1;
 
 %create coordinates