Changeset 21510

Timestamp:

02/02/17 15:33:44 (8 years ago)

Author:

schlegel

Message:

NEW: remove solver residual hard code from solutionsequence_linear

Location:

issm/trunk-jpl/src

Files:

• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
• c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
• c/shared/Enum/StringToEnumx.cpp (modified) (7 diffs)
• c/solutionsequences/solutionsequence_linear.cpp (modified) (3 diffs)
• m/classes/settings.js (modified) (5 diffs)
• m/classes/settings.m (modified) (6 diffs)
• m/classes/settings.py (modified) (5 diffs)

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -60 +60 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.settings.results_on_nodes",SettingsResultsOnNodesEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.settings.io_gather",SettingsIoGatherEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.settings.solver_residue_threshold",SettingsSolverResidueThresholdEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.autodiff.isautodiff",AutodiffIsautodiffEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.qmu.isdakota",QmuIsdakotaEnum));

issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h

@@ -309 +309 @@
         SettingsRecordingFrequencyEnum,
         SettingsWaitonlockEnum,
+        SettingsSolverResidueThresholdEnum,
         DebugProfilingEnum,
         ProfilingCurrentMemEnum,

issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp

@@ -315 +315 @@
                 case SettingsRecordingFrequencyEnum : return "SettingsRecordingFrequency";
                 case SettingsWaitonlockEnum : return "SettingsWaitonlock";
+                case SettingsSolverResidueThresholdEnum : return "SettingsSolverResidueThreshold";
                 case DebugProfilingEnum : return "DebugProfiling";
                 case ProfilingCurrentMemEnum : return "ProfilingCurrentMem";

issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp

@@ -321 +321 @@
               else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsRecordingFrequencyEnum;
               else if (strcmp(name,"SettingsWaitonlock")==0) return SettingsWaitonlockEnum;
+              else if (strcmp(name,"SettingsSolverResidueThreshold")==0) return SettingsSolverResidueThresholdEnum;
               else if (strcmp(name,"DebugProfiling")==0) return DebugProfilingEnum;
               else if (strcmp(name,"ProfilingCurrentMem")==0) return ProfilingCurrentMemEnum;
@@ -382 +383 @@
               else if (strcmp(name,"SmbWini")==0) return SmbWiniEnum;
               else if (strcmp(name,"SmbAini")==0) return SmbAiniEnum;
-              else if (strcmp(name,"SmbTini")==0) return SmbTiniEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum;
+              if (strcmp(name,"SmbTini")==0) return SmbTiniEnum;
+              else if (strcmp(name,"SmbSizeini")==0) return SmbSizeiniEnum;
               else if (strcmp(name,"SMBforcing")==0) return SMBforcingEnum;
               else if (strcmp(name,"SmbMassBalance")==0) return SmbMassBalanceEnum;
@@ -505 +506 @@
               else if (strcmp(name,"Temperature")==0) return TemperatureEnum;
               else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum;
-              else if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
          else stage=5;
    }
    if(stage==5){
-              if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
+              if (strcmp(name,"TemperaturePDD")==0) return TemperaturePDDEnum;
+              else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum;
               else if (strcmp(name,"SurfaceAbsMisfit")==0) return SurfaceAbsMisfitEnum;
               else if (strcmp(name,"Vel")==0) return VelEnum;
@@ -628 +629 @@
               else if (strcmp(name,"Outputdefinition39")==0) return Outputdefinition39Enum;
               else if (strcmp(name,"Outputdefinition40")==0) return Outputdefinition40Enum;
-              else if (strcmp(name,"Outputdefinition41")==0) return Outputdefinition41Enum;
          else stage=6;
    }
    if(stage==6){
-              if (strcmp(name,"Outputdefinition42")==0) return Outputdefinition42Enum;
+              if (strcmp(name,"Outputdefinition41")==0) return Outputdefinition41Enum;
+              else if (strcmp(name,"Outputdefinition42")==0) return Outputdefinition42Enum;
               else if (strcmp(name,"Outputdefinition43")==0) return Outputdefinition43Enum;
               else if (strcmp(name,"Outputdefinition44")==0) return Outputdefinition44Enum;
@@ -751 +752 @@
               else if (strcmp(name,"Mumps")==0) return MumpsEnum;
               else if (strcmp(name,"Gsl")==0) return GslEnum;
-              else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
          else stage=7;
    }
    if(stage==7){
-              if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
+              if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
+              else if (strcmp(name,"BuddJacka")==0) return BuddJackaEnum;
               else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
               else if (strcmp(name,"Paterson")==0) return PatersonEnum;
@@ -874 +875 @@
               else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum;
-              else if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
          else stage=8;
    }
    if(stage==8){
-              if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
+              if (strcmp(name,"Balancethickness2Analysis")==0) return Balancethickness2AnalysisEnum;
+              else if (strcmp(name,"Balancethickness2Solution")==0) return Balancethickness2SolutionEnum;
               else if (strcmp(name,"BalancethicknessSoftAnalysis")==0) return BalancethicknessSoftAnalysisEnum;
               else if (strcmp(name,"BalancethicknessSoftSolution")==0) return BalancethicknessSoftSolutionEnum;
@@ -997 +998 @@
               else if (strcmp(name,"Contours")==0) return ContoursEnum;
               else if (strcmp(name,"Parameters")==0) return ParametersEnum;
-              else if (strcmp(name,"Vertices")==0) return VerticesEnum;
          else stage=9;
    }
    if(stage==9){
-              if (strcmp(name,"Results")==0) return ResultsEnum;
+              if (strcmp(name,"Vertices")==0) return VerticesEnum;
+              else if (strcmp(name,"Results")==0) return ResultsEnum;
               else if (strcmp(name,"MaximumNumberOfDefinitions")==0) return MaximumNumberOfDefinitionsEnum;
          else stage=10;

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_linear.cpp

@@ -19 +19 @@
         Vector<IssmDouble>*  ys  = NULL;
         int  configuration_type;
+        IssmDouble solver_residue_threshold;
         
         /*solver convergence test: */
@@ -27 +28 @@
         Vector<IssmDouble>* KUF=NULL;
 
-
-
         /*Recover parameters: */
         femmodel->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
+        femmodel->parameters->FindParam(&solver_residue_threshold,SettingsSolverResidueThresholdEnum);
         femmodel->UpdateConstraintsx();
         SystemMatricesx(&Kff,&Kfs,&pf,&df,NULL,femmodel);
@@ -47 +47 @@
         nF=pf->Norm(NORM_TWO);
         solver_residue=nKUF/nF;
-        if(solver_residue>1.e-6)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
+        if(isnan(solver_residue_threshold) == false && solver_residue>solver_residue_threshold)_error_("   solver residue too high!: norm(KU-F)/norm(F)=" << solver_residue << "\n");
 
         //clean up

issm/trunk-jpl/src/m/classes/settings.js

@@ -27 +27 @@
                 //upload options: 
                 upload_port         = 0;
+                
+                //throw an error if solver residue exceeds this value
+                self.solver_residue_threshold=1e-6;
 
         }// }}}
@@ -43 +46 @@
                 fielddisplay(this,'upload_port','port login (default is 0)');
                 fielddisplay(this,'upload_filename','unique id generated when uploading the file to server');
+                fielddisplay(this,'solver_residue_threshold','throw an error if solver residue exceeds this value');
 
 
@@ -58 +62 @@
                         checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0);
                         checkfield(md,'fieldname','settings.waitonlock','numel',[1]);
+                        checkfield(md,'fieldname','settings.solver_residue_threshold','numel',[1],'>',0);
                 } // }}}
                 this.marshall=function(md,prefix,fid) { //{{{
@@ -65 +70 @@
                         WriteData(fid,prefix,'object',this,'fieldname','output_frequency','format','Integer');
                         WriteData(fid,prefix,'object',this,'fieldname','recording_frequency','format','Integer');
+                        WriteData(fid,prefix,'object',this,'fieldname','solver_residue_threshold','format','Double');
                         if (this.waitonlock>0) WriteData(fid,prefix,'name','md.settings.waitonlock','data',true,'format','Boolean');
                         else WriteData(fid,prefix,'name','md.settings.waitonlock','data',false,'format','Boolean');
@@ -83 +89 @@
         this.upload_port         = 0;
         this.upload_filename     = '';
+        this.solver_residue_threshold = 0;
         this.setdefaultparameters();
         //}}}

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

@@ -17 +17 @@
                 upload_port         = 0;
                 upload_filename     = '';
+                solver_residue_threshold = 0;
         end
         methods
@@ -48 +49 @@
 
                         %upload options: 
-                        upload_port         = 0;
+                        self.upload_port         = 0;
+
+                        %throw an error if solver residue exceeds this value
+                        self.solver_residue_threshold = 1e-6;
 
                 end % }}}
@@ -59 +63 @@
                         md = checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0);
                         md = checkfield(md,'fieldname','settings.waitonlock','numel',[1]);
+                        md = checkfield(md,'fieldname','settings.solver_residue_threshold','numel',[1],'>',0);
 
                 end % }}}
@@ -75 +80 @@
                         fielddisplay(self,'upload_port','port login (default is 0)');
                         fielddisplay(self,'upload_filename','unique id generated when uploading the file to server');
+                        fielddisplay(self,'solver_residue_threshold','throw an error if solver residue exceeds this value (NaN to deactivate)');
 
                 end % }}}
@@ -84 +90 @@
                         WriteData(fid,prefix,'object',self,'fieldname','recording_frequency','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','waitonlock','data',self.waitonlock>0,'format','Boolean');
+                        WriteData(fid,prefix,'object',self,'fieldname','solver_residue_threshold','format','Double');
                 end % }}}
                 function savemodeljs(self,fid,modelname) % {{{
@@ -98 +105 @@
                         writejsdouble(fid,[modelname '.settings.upload_port'],self.upload_port);
                         writejsstring(fid,[modelname '.settings.upload_filename'],self.upload_filename);
-
+                        writejsstring(fid,[modelname '.settings.solver_residue_threshold'],self.solver_residue_threshold);
                 end % }}}
         end

issm/trunk-jpl/src/m/classes/settings.py

@@ -18 +18 @@
                 self.recording_frequency = 0
                 self.waitonlock          = 0
+                self.solver_residue_threshold = 0
 
                 #set defaults
@@ -32 +33 @@
                 string="%s\n%s"%(string,fielddisplay(self,"recording_frequency","frequency at which the runs are being recorded, allowing for a restart"))
                 string="%s\n%s"%(string,fielddisplay(self,"waitonlock","maximum number of minutes to wait for batch results, or return 0"))
+                string="%s\n%s"%(string,fielddisplay(self,"solver_residue_threshold","throw an error if solver residue exceeds this value (NaN to deactivate)"))
                 return string
                 #}}}
@@ -55 +57 @@
                 self.waitonlock=2**31-1
 
+      #throw an error if solver residue exceeds this value
+                self.solver_residue_threshold=1e-6;
+
                 return self
         #}}}
@@ -64 +69 @@
                 md = checkfield(md,'fieldname','settings.recording_frequency','numel',[1],'>=',0)
                 md = checkfield(md,'fieldname','settings.waitonlock','numel',[1])
+                md = checkfield(md,'fieldname','settings.solver_residue_threshold','numel',[1],'>',0)
 
                 return md
@@ -73 +79 @@
                 WriteData(fid,prefix,'object',self,'fieldname','output_frequency','format','Integer')
                 WriteData(fid,prefix,'object',self,'fieldname','recording_frequency','format','Integer')
+                WriteData(fid,prefix,'object',self,'fieldname','solver_residue_threshold','format','Double')
                 if self.waitonlock>0:
                         WriteData(fid,prefix,'name','md.settings.waitonlock','data',True,'format','Boolean');