Changeset 426 for trunk/src

Timestamp:

May 17, 2012, 10:58:49 AM (12 years ago)

Author:

sommeria

Message:

compiled matlab civ introduced in Batch mode,
minor bugs fixed for histogram of velocity

Location:

trunk/src

Files:

• civ.m (modified) (2 diffs)
• plot_field.m (modified) (1 diff)
• uvmat.m (modified) (1 diff)

trunk/src/civ.m

@@ -1177 +1177 @@
     case 'Matlab'
         if batch
+            binary_list={'CivmBin'};
             % verifier MenuMatlab installe sur le cluster
             % difficile a faire a priori
@@ -1607 +1608 @@
                             return
                         end
-                        text_matlabscript=[...
-                        '#!/bin/bash \n'...
-                        '. /etc/sysprofile \n'...
-                        'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
-                        'cd(''' path_civ '''); \n'...
-                        'civ_matlab(''' filename_xml ''',''' OutputFile '.nc''); \n'...
-                        'exit \n'...
-                        'END_MATLAB \n'];
-                        fprintf(fid,text_matlabscript);
+%                         text_matlabscript=[...
+%                         '#!/bin/bash \n'...
+%                         '. /etc/sysprofile \n'...
+%                         'matlab -nodisplay -nosplash -nojvm <<END_MATLAB \n'...
+%                         'cd(''' path_civ '''); \n'...
+%                         'civ_matlab(''' filename_xml ''',''' OutputFile '.nc''); \n'...
+%                         'exit \n'...
+%                         'END_MATLAB \n'];
+                        cmd=['#!/bin/bash \n '...
+                        '#$ -cwd \n '...
+                        'hostname && date \n '...
+                        'umask 002 \n'...
+                         Param.xml.CivmBin ' ' Param.xml.RunTime ' ' filename_xml ' ' OutputFile '.nc'];%allow writting access to created files for user group
+                    
+                        fprintf(fid,cmd);
                         fclose(fid);
                         if isunix

trunk/src/plot_field.m

@@ -358 +358 @@
     end
     testplot=ones(size(data.ListVarName));%default test for plotted variables
-    xtitle=[xtitle data.ListVarName{coord_x_index}];
-    eval(['coord_x{icell}=data.' data.ListVarName{coord_x_index} ';']);%coordinate variable set as coord_x
-    if isfield(data,'VarAttribute')&& numel(data.VarAttribute)>=coord_x_index && isfield(data.VarAttribute{coord_x_index},'units')
-        xtitle=[xtitle '(' data.VarAttribute{coord_x_index}.units '), '];
-    else
-        xtitle=[xtitle ', '];
-    end
-    eval(['coord_x{icell}=data.' data.ListVarName{coord_x_index} ';']);%coordinate variable set as coord_x
+    coord_x_name{icell}=data.ListVarName{coord_x_index};
+    coord_x{icell}=data.(data.ListVarName{coord_x_index});%coordinate variable set as coord_x
+    if isempty(find(strcmp(coord_x_name{icell},coord_x_name(1:end-1)))) %xtitle not already selected
+        xtitle=[xtitle coord_x_name{icell}];
+        if isfield(data,'VarAttribute')&& numel(data.VarAttribute)>=coord_x_index && isfield(data.VarAttribute{coord_x_index},'units')
+            xtitle=[xtitle '(' data.VarAttribute{coord_x_index}.units '), '];
+        else
+            xtitle=[xtitle ', '];
+        end
+    end
     XMin(icell)=min(coord_x{icell});
     XMax(icell)=max(coord_x{icell});

trunk/src/uvmat.m

@@ -2852 +2852 @@
         end
         plot_field(Histo,handles.histo_u);
+        hlegend=legend;
+        if isempty(FieldName_2)
+        set(hlegend,'String',FieldName)
+        else
+            set(hlegend,'String',{FieldName;FieldName_2})
+        end
+%         hh=get(handles.histo_u,'children');
+%         get(hh(1))
+%         get(hh(2))
     end
 end