Changeset 8130

Timestamp:

05/04/11 11:28:51 (14 years ago)

Author:

Mathieu Morlighem

Message:

Now cm_min and cm_max are of size md.numberofgrids x 1 -> very useful for BalanceThickness

Location:

issm/trunk/src/m

Files:

• classes/model.m (modified) (3 diffs)
• model/ismodelselfconsistent.m (modified) (2 diffs)
• utils/Model/loadmodel.m (modified) (1 diff)

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

@@ -219 +219 @@
                  eps_cm=0;
                  cm_noisedmp=0;
-                 cm_min=0;
-                 cm_max=0;
+                 cm_min=NaN;
+                 cm_max=NaN;
                  cm_jump=[];
                  cm_gradient=0;
@@ -259 +259 @@
                  melting_rate=NaN;
                  melting_rate_correction=NaN;
-                 melting_rate_correction_apply=NaN;
+                 melting_rate_correction_apply=0;
                  pressure=NaN;
                  
@@ -677 +677 @@
                          md.cm_jump=.7*ones(md.nsteps,1); %30 per cent decrement.
 
-                         %cm_min is the minimum acceptable value of the
-                         %inversed parameter (B>0 for example)
-                         md.cm_min=0;
-
-                         %cm_max is the maximum acceptable value of the
-                         %inversed parameter (drag<200 for example)
-                         md.cm_max=200;
-
                          %stop control solution at the gradient computation and return it? 
                          md.cm_gradient=0;

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -188 +188 @@
         checksize(md,fields,[md.nsteps num_controls]);
         fields={'cm_min','cm_max'};
-        checksize(md,fields,[1 num_controls]);
+        checksize(md,fields,[md.numberofgrids num_controls]);
 
         %RESPONSES
@@ -532 +532 @@
                 else
                         if ((size(field)~=fieldsize(1)) |  (size(field,2)~=fieldsize(2)))
+                                %WARNING: new version
+                                if strcmp(fields{i},'cm_min'),
+                                        disp('!!! ');
+                                        disp('!!! WARNING: cm_min must now be of size [md.numberofgrids x 1]. Update your parameter file as follows:');
+                                        disp('!!! ');
+                                        disp('!!! md.cm_min=md.cm_min*ones(md.numberofgrids,1);');
+                                        disp('!!! ');
+                                end
+                                %WARNING: new version
+                                if strcmp(fields{i},'cm_max'),
+                                        disp('!!! ');
+                                        disp('!!! WARNING: cm_max must now be of size [md.numberofgrids x 1]. Update your parameter file as follows:');
+                                        disp('!!! ');
+                                        disp('!!! md.cm_max=md.cm_max*ones(md.numberofgrids,1);');
+                                        disp('!!! ');
+                                end
                                 error(['model not consistent: field ' fields{i} ' size should be ' num2str(fieldsize(1)) ' x ' num2str(fieldsize(2))]);
                         end

issm/trunk/src/m/utils/Model/loadmodel.m

@@ -19 +19 @@
 try,
         %recover model on file and name it md
+        warning off
         struc=load(path,'-mat');
+        warning on
         name=char(fieldnames(struc));
         if size(name,1)>1,