Changeset 20967

Timestamp:

07/20/16 16:41:22 (9 years ago)

Author:

felicity

Message:

CHG: set materials ESTAR parameters to be consistent with Glen type flow relation

Location:

issm/trunk-jpl/src/m

Files:

• classes/matestar.m (modified) (1 diff)
• plot/colormaps/getcolormap.m (modified) (1 diff)

issm/trunk-jpl/src/m/classes/matestar.m

@@ -52 +52 @@
                                                         self.(fieldname) = inputstruct.(fieldname);
                                                 end
+                                        end
+                                        if strcmp(class(inputstruct),'matice'),
+                                                disp('Converting materials to ESTAR, keeping a Glen type relation');
+                                                %Set parameters so that we still use a Glen's like flow relation
+                                                self.rheology_Es = ones(size(inputstruct.rheology_B));
+                                                self.rheology_Ec = ones(size(inputstruct.rheology_B));
+                                                self.rheology_ko = inputstruct.rheology_B.^(-3)*3/2;
                                         end
                                 otherwise

issm/trunk-jpl/src/m/plot/colormaps/getcolormap.m

@@ -32 +32 @@
                 error('damage colormap requires Image Processing Toolbox, please try another colormap');
         end
+elseif strcmpi(map,'orangepurple'),
+        map = hsv(128);
+        map = rgb2hsv(map);
+        map(:,2)       = max(min( abs(map(:,1)-0.5)/0.5 ,1),0);
+        map(1:64,1)   = 0.7;
+        map(65:end,1) = 1;
+        map = hsv2rgb(map);
 elseif strcmpi(map,'redblue'),
         map = hsv(128);