Changeset 18356

Timestamp:

08/08/14 16:53:05 (11 years ago)

Author:

Eric.Larour

Message:

CHG: trying new database capability.

Location:

issm/branches/trunk-jpl-ad2/src/m/plot

Files:

• plot_gl.m (modified) (4 diffs)
• writejsfield.m (modified) (2 diffs)
• writejsfile.m (added)

issm/branches/trunk-jpl-ad2/src/m/plot/plot_gl.m

@@ -49 +49 @@
 %intial view angle: 
 replacestringinfile('./generic/editables.js','var view_number_default = 3;',['var view_number_default = ' num2str(getfieldvalue(options,'view_number_default',3)) ';']);
+        
+%zoom
+replacestringinfile('./generic/editables.js','initialZoomFactor = -.20;',['initialZoomFactor = ' num2str(getfieldvalue(options,'zoom',-.25)) ';']);
 
 %Deal with mesh and results {{{
         
-        fid=fopen([database 'model_coords.js'],'w');
-
+        
         lat=md.mesh.lat;
         long=md.mesh.long;
@@ -65 +67 @@
         y = R .* cosd(lat) .* sind(long);
         z = R .* sind(lat);
+
+        %initialize model: 
+        model.title='Brunt Ice Shelf';
+
+        %Deal with triangulation: 
+        model.index=md.mesh.elements;
+        model.x=x;
+        model.y=y;
+        model.z=z;
+        model.surface=surface;
         
-
-        %write index:
-        fprintf(fid,'<!-- index{{{-->\n');
-        fprintf(fid,'var index=[');
-        for i=1:md.mesh.numberofelements-1,
-                fprintf(fid,'[%i, %i, %i],',md.mesh.elements(i,1),md.mesh.elements(i,2),md.mesh.elements(i,3));
-        end
-        fprintf(fid,'[%i, %i, %i]];\n',md.mesh.elements(end,1),md.mesh.elements(end,2),md.mesh.elements(end,3));
-        fprintf(fid,'<!--}}}-->\n');
-        writejsfield(fid,'x',x,numberofvertices);
-        writejsfield(fid,'y',y,numberofvertices);
-        writejsfield(fid,'z',z,numberofvertices);
-        writejsfield(fid,'surface',surface,numberofvertices);
-
         %Deal with data: 
-        datastring='';
-        caxis1string='';
-        caxis2string='';
-        labelstring='';
-        shortlabelstring='';
-        unitstring='';
-        zoom=getfieldvalue(options,'zoom',-.25);
+        results=struct([]);
         for i=1:length(optionslist),
                 options=optionslist{i}; options=checkplotoptions(md,options);
                 data=getfieldvalue(options,'data');
-                caxis=getfieldvalue(options,'caxis',[min(data(:)) max(data(:))]);
+                results(i).data=data;
+                results(i).caxis=getfieldvalue(options,'caxis',[min(data(:)) max(data(:))]);
+
                 label=getfieldvalue(options,'label','');
-                shortlabel=getfieldvalue(options,'shortlabel','');
                 if strcmpi(label,''),
                         %create generic label: 
                         label=['data' num2str(i)];
                 end
+                results(i).label=label;
+
+                shortlabel=getfieldvalue(options,'shortlabel','');
                 if strcmpi(shortlabel,''),
                         %create generic short label: 
                         shortlabel=['data' num2str(i)];
                 end
+                results(i).shortlabel=shortlabel;
+
                 unit=getfieldvalue(options,'unit','');
                 if strcmpi(unit,''),
@@ -107 +105 @@
                         unit='SI';
                 end
-
-                if i<length(optionslist),
-                        datastring=[datastring '"data' num2str(i) '",'];
-                        caxis1string=[caxis1string num2str(caxis(1)) ','];
-                        caxis2string=[caxis2string num2str(caxis(2)) ','];
-                        labelstring=[labelstring '"' label '"' ','];
-                        shortlabelstring=[shortlabelstring '"' shortlabel '"' ','];
-                        unitstring=[unitstring '"' unit '"' ','];
-                else
-                        datastring=[datastring '"data' num2str(i) '"' ];
-                        caxis1string=[caxis1string num2str(caxis(1))];
-                        caxis2string=[caxis2string num2str(caxis(2))];
-                        labelstring=[labelstring '"' label '"'];
-                        shortlabelstring=[shortlabelstring '"' shortlabel '"'];
-                        unitstring=[unitstring '"' unit '"'];
-                end
-                writejsfield(fid,['data' num2str(i)],data,md.mesh.numberofvertices);
+                results(i).unit=unit;
         end
-        fclose(fid);
+        model.results=results;
         
-        replacestringinfile('./generic/editables.js','"Velocity"',labelstring);
-        replacestringinfile('./generic/editables.js','"V"',shortlabelstring);
-        replacestringinfile('./generic/editables.js','"velocity"',datastring);
-        replacestringinfile('./generic/editables.js','var data_min_array = [0',['var data_min_array = [' caxis1string]);
-        replacestringinfile('./generic/editables.js','var data_max_array = [3500',['var data_max_array = [' caxis2string]);
-        replacestringinfile('./generic/editables.js','"m/yr"',unitstring);
-
-        replacestringinfile('./generic/editables.js','initialZoomFactor = -.20;',['initialZoomFactor = ' num2str(zoom) ';']);
-% }}}
+        %Write model to javascript database file: 
+        writejsfile([database 'brunt.js'],model,'brunt')
+%}}}
 
 %Open browser with results: 
@@ -142 +118 @@
 %Come back to present directory: 
 cd(presentdir);
+
+

issm/branches/trunk-jpl-ad2/src/m/plot/writejsfield.m

@@ -9 +9 @@
         if size(variable,2)==1,
                 fprintf(fid,'<!-- %s{{{-->\n',name);
-                fprintf(fid,'var %s=[',name);
+                fprintf(fid,'%s=[',name);
                 for i=1:nods-1,
                         fprintf(fid,'%g,',variable(i));
@@ -18 +18 @@
                 %multi-sized array: 
                 fprintf(fid,'<!-- %s{{{-->\n',name);
-                fprintf(fid,'var %s={}\n',name);
+                fprintf(fid,'%s=[]\n',name);
                 for i=1:size(variable,2),
                         fprintf(fid,'%s["%i"]=[',name,i);