Changeset 25741

Timestamp:

11/09/20 11:38:03 (4 years ago)

Author:

Cheng Gong

Message:

CHG: change calving_max to migration_max

Location:

issm/trunk-jpl/src

Files:

• c/analyses/LevelsetAnalysis.cpp (modified) (4 diffs)
• c/shared/Enum/Enum.vim (modified) (3 diffs)
• c/shared/Enum/EnumDefinitions.h (modified) (2 diffs)
• c/shared/Enum/EnumToStringx.cpp (modified) (3 diffs)
• c/shared/Enum/StringToEnumx.cpp (modified) (5 diffs)
• m/classes/levelset.m (modified) (6 diffs)
• m/classes/levelset.py (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp

@@ -106 +106 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.levelset.reinit_frequency",LevelsetReinitFrequencyEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.levelset.kill_icebergs",LevelsetKillIcebergsEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.levelset.calving_max",CalvingMaxEnum));
+        parameters->AddObject(iomodel->CopyConstantObject("md.levelset.migration_max",MigrationMaxEnum));
 
         int  calvinglaw;
@@ -193 +193 @@
         IssmDouble vel,v[3],w[3],c[3],m[3],dlsf[3];
         IssmDouble norm_dlsf, norm_calving, calvingrate, meltingrate, groundedice;
-        IssmDouble calvingmax, calvinghaf, heaviside, haf_eps;
+        IssmDouble migrationmax, calvinghaf, heaviside, haf_eps;
         IssmDouble* xyz_list = NULL;
 
@@ -224 +224 @@
         basalelement->GetVerticesCoordinates(&xyz_list);
         basalelement->FindParam(&dt,TimesteppingTimeStepEnum);
-        basalelement->FindParam(&calvingmax,CalvingMaxEnum);
+        basalelement->FindParam(&migrationmax,MigrationMaxEnum);
         Input* vx_input           = NULL;
         Input* vy_input           = NULL;
@@ -340 +340 @@
                                 /*Limit calving rate to c <= v + 3 km/yr */
                                 vel=sqrt(v[0]*v[0] + v[1]*v[1]);
-                                if(calvingrate>calvingmax+vel) calvingrate = vel+calvingmax;
+                                if(calvingrate>migrationmax+vel) calvingrate = vel+migrationmax;
                                 if(groundedice<0) meltingrate = 0.;
 

issm/trunk-jpl/src/c/shared/Enum/Enum.vim

@@ -103 +103 @@
 syn keyword cConstant CalvingHeightAboveFloatationEnum
 syn keyword cConstant CalvingLawEnum
-syn keyword cConstant CalvingMaxEnum
 syn keyword cConstant CalvingMinthicknessEnum
 syn keyword cConstant ConfigurationTypeEnum
@@ -290 +289 @@
 syn keyword cConstant MeshNumberoflayersEnum
 syn keyword cConstant MeshNumberofverticesEnum
+syn keyword cConstant MigrationMaxEnum
 syn keyword cConstant ModelIdEnum
 syn keyword cConstant NbinsEnum
@@ -361 +361 @@
 syn keyword cConstant SettingsNumResultsOnNodesEnum
 syn keyword cConstant SettingsOutputFrequencyEnum
-syn keyword cConstant SettingsRecordingFrequencyEnum
+syn keyword cConstant SettingsCheckpointFrequencyEnum
 syn keyword cConstant SettingsResultsOnNodesEnum
 syn keyword cConstant SettingsSbCouplingFrequencyEnum

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

@@ -97 +97 @@
         CalvingHeightAboveFloatationEnum,
         CalvingLawEnum,
-        CalvingMaxEnum,
         CalvingMinthicknessEnum,
         ConfigurationTypeEnum,
@@ -284 +283 @@
         MeshNumberoflayersEnum,
         MeshNumberofverticesEnum,
+        MigrationMaxEnum,
         ModelIdEnum,
         NbinsEnum,

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

@@ -105 +105 @@
                 case CalvingHeightAboveFloatationEnum : return "CalvingHeightAboveFloatation";
                 case CalvingLawEnum : return "CalvingLaw";
-                case CalvingMaxEnum : return "CalvingMax";
                 case CalvingMinthicknessEnum : return "CalvingMinthickness";
                 case ConfigurationTypeEnum : return "ConfigurationType";
@@ -292 +291 @@
                 case MeshNumberoflayersEnum : return "MeshNumberoflayers";
                 case MeshNumberofverticesEnum : return "MeshNumberofvertices";
+                case MigrationMaxEnum : return "MigrationMax";
                 case ModelIdEnum : return "ModelId";
                 case NbinsEnum : return "Nbins";
@@ -363 +363 @@
                 case SettingsNumResultsOnNodesEnum : return "SettingsNumResultsOnNodes";
                 case SettingsOutputFrequencyEnum : return "SettingsOutputFrequency";
-                case SettingsCheckpointFrequencyEnum : return "SettingsRecordingFrequency";
+                case SettingsCheckpointFrequencyEnum : return "SettingsCheckpointFrequency";
                 case SettingsResultsOnNodesEnum : return "SettingsResultsOnNodes";
                 case SettingsSbCouplingFrequencyEnum : return "SettingsSbCouplingFrequency";

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

@@ -105 +105 @@
               else if (strcmp(name,"CalvingHeightAboveFloatation")==0) return CalvingHeightAboveFloatationEnum;
               else if (strcmp(name,"CalvingLaw")==0) return CalvingLawEnum;
-              else if (strcmp(name,"CalvingMax")==0) return CalvingMaxEnum;
               else if (strcmp(name,"CalvingMinthickness")==0) return CalvingMinthicknessEnum;
               else if (strcmp(name,"ConfigurationType")==0) return ConfigurationTypeEnum;
@@ -137 +136 @@
               else if (strcmp(name,"DomainDimension")==0) return DomainDimensionEnum;
               else if (strcmp(name,"DomainType")==0) return DomainTypeEnum;
+              else if (strcmp(name,"DslModel")==0) return DslModelEnum;
          else stage=2;
    }
    if(stage==2){
-              if (strcmp(name,"DslModel")==0) return DslModelEnum;
-              else if (strcmp(name,"DslModelid")==0) return DslModelidEnum;
+              if (strcmp(name,"DslModelid")==0) return DslModelidEnum;
               else if (strcmp(name,"DslNummodels")==0) return DslNummodelsEnum;
               else if (strcmp(name,"DslComputeFingerprints")==0) return DslComputeFingerprintsEnum;
@@ -260 +259 @@
               else if (strcmp(name,"LoveNfreq")==0) return LoveNfreqEnum;
               else if (strcmp(name,"LoveR0")==0) return LoveR0Enum;
+              else if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"LoveShNmax")==0) return LoveShNmaxEnum;
-              else if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
+              if (strcmp(name,"LoveShNmin")==0) return LoveShNminEnum;
               else if (strcmp(name,"MassFluxSegments")==0) return MassFluxSegmentsEnum;
               else if (strcmp(name,"MassFluxSegmentsPresent")==0) return MassFluxSegmentsPresentEnum;
@@ -298 +297 @@
               else if (strcmp(name,"MeshNumberoflayers")==0) return MeshNumberoflayersEnum;
               else if (strcmp(name,"MeshNumberofvertices")==0) return MeshNumberofverticesEnum;
+              else if (strcmp(name,"MigrationMax")==0) return MigrationMaxEnum;
               else if (strcmp(name,"ModelId")==0) return ModelIdEnum;
               else if (strcmp(name,"Nbins")==0) return NbinsEnum;
@@ -369 +369 @@
               else if (strcmp(name,"SettingsNumResultsOnNodes")==0) return SettingsNumResultsOnNodesEnum;
               else if (strcmp(name,"SettingsOutputFrequency")==0) return SettingsOutputFrequencyEnum;
-              else if (strcmp(name,"SettingsRecordingFrequency")==0) return SettingsCheckpointFrequencyEnum;
+              else if (strcmp(name,"SettingsCheckpointFrequency")==0) return SettingsCheckpointFrequencyEnum;
               else if (strcmp(name,"SettingsResultsOnNodes")==0) return SettingsResultsOnNodesEnum;
               else if (strcmp(name,"SettingsSbCouplingFrequency")==0) return SettingsSbCouplingFrequencyEnum;

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

@@ -10 +10 @@
                 reinit_frequency        = 5;
                 kill_icebergs     = 0;
-                calving_max       = 0.;
+                migration_max       = 0.;
                 fe                = 'P1';
         end
@@ -42 +42 @@
                         self.reinit_frequency = 5;
                         self.kill_icebergs    = 1;
-                        self.calving_max      = 3000.;
+                        self.migration_max      = 3000.;
 
                         %Linear elements by default
@@ -55 +55 @@
                         md = checkfield(md,'fieldname','levelset.stabilization','values',[0 1 2]);
                         md = checkfield(md,'fieldname','levelset.kill_icebergs','numel',1,'values',[0 1]);
-                        md = checkfield(md,'fieldname','levelset.calving_max','numel',1,'NaN',1,'Inf',1,'>',0);
+                        md = checkfield(md,'fieldname','levelset.migration_max','numel',1,'NaN',1,'Inf',1,'>',0);
                         md = checkfield(md,'fieldname','levelset.fe','values',{'P1','P2'});
                 end % }}}
@@ -64 +64 @@
                         fielddisplay(self,'reinit_frequency','Amount of time steps after which the levelset function in re-initialized');
                         fielddisplay(self,'kill_icebergs','remove floating icebergs to prevent rigid body motions (1: true, 0: false)');
-                        fielddisplay(self,'calving_max','maximum allowed calving rate (m/a)');
+                        fielddisplay(self,'migration_max','maximum allowed migration rate (m/a)');
                         fielddisplay(self,'fe','Finite Element type: ''P1'' (default), or ''P2''');
                 end % }}}
@@ -75 +75 @@
                         WriteData(fid,prefix,'object',self,'fieldname','reinit_frequency','format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','kill_icebergs','format','Boolean');
-                        WriteData(fid,prefix,'object',self,'fieldname','calving_max','format','Double','scale',1./yts);
+                        WriteData(fid,prefix,'object',self,'fieldname','migration_max','format','Double','scale',1./yts);
                         WriteData(fid,prefix,'object',self,'fieldname','fe','format','String');
                 end % }}}
@@ -83 +83 @@
                         writejs1Darray(fid,[modelname '.levelset.reinit_frequency'],self.reinit_frequency);
                         writejsdouble(fid,[modelname '.levelset.kill_icebergs'],self.kill_icebergs);
-                        writejsdouble(fid,[modelname '.levelset.calving_max'],self.calving_max);
+                        writejsdouble(fid,[modelname '.levelset.migration_max'],self.migration_max);
                 end % }}}
         end

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

@@ -19 +19 @@
         self.reinit_frequency = 0
         self.kill_icebergs = 0
-        self.calving_max = 0.
+        self.migration_max = 0.
         self.fe = 'P1'
 
@@ -32 +32 @@
         string = "%s\n%s" % (string, fielddisplay(self, 'reinit_frequency', 'Amount of time steps after which the levelset function in re-initialized'))
         string = "%s\n%s" % (string, fielddisplay(self, 'kill_icebergs', 'remove floating icebergs to prevent rigid body motions (1: true, 0: false)'))
-        string = "%s\n%s" % (string, fielddisplay(self, 'calving_max', 'maximum allowed calving rate (m / a)'))
+        string = "%s\n%s" % (string, fielddisplay(self, 'migration_max', 'maximum allowed migration rate (m / a)'))
         string = "%s\n%s" % (string, fielddisplay(self, 'fe', 'Finite Element type: ''P1'' (default), or ''P2'''))
 
@@ -48 +48 @@
         self.reinit_frequency = 5
         self.kill_icebergs = 1
-        self.calving_max = 3000.
+        self.migration_max = 3000.
 
     #Linear elements by default
@@ -64 +64 @@
         md = checkfield(md, 'fieldname', 'levelset.stabilization', 'numel', [1], 'values', [0, 1, 2])
         md = checkfield(md, 'fieldname', 'levelset.kill_icebergs', 'numel', [1], 'values', [0, 1])
-        md = checkfield(md, 'fieldname', 'levelset.calving_max', 'numel', [1], 'NaN', 1, 'Inf', 1, '>', 0)
+        md = checkfield(md, 'fieldname', 'levelset.migration_max', 'numel', [1], 'NaN', 1, 'Inf', 1, '>', 0)
         md = checkfield(md, 'fieldname', 'levelset.fe', 'values', ['P1', 'P2'])
 
@@ -77 +77 @@
         WriteData(fid, prefix, 'object', self, 'fieldname', 'reinit_frequency', 'format', 'Integer')
         WriteData(fid, prefix, 'object', self, 'fieldname', 'kill_icebergs', 'format', 'Boolean')
-        WriteData(fid, prefix, 'object', self, 'fieldname', 'calving_max', 'format', 'Double', 'scale', 1. / yts)
+        WriteData(fid, prefix, 'object', self, 'fieldname', 'migration_max', 'format', 'Double', 'scale', 1. / yts)
         WriteData(fid, prefix, 'object', self, 'fieldname', 'fe', 'format', 'String')
     # }}}