Changeset 27010

Timestamp:

05/18/22 10:44:28 (3 years ago)

Author:

Cheng Gong

Message:

BUG: fix the missing field in tests

Location:

issm/trunk-jpl/src

Files:

• c/analyses/LevelsetAnalysis.cpp (modified) (1 diff)
• m/classes/frontalforcings.m (modified) (2 diffs)

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

@@ -146 +146 @@
                 case FrontalForcingsDefaultEnum:
                         iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.meltingrate",CalvingMeltingrateEnum);
-                        iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.ablationrate",CalvingAblationrateEnum);
+                        if (calvinglaw == CalvingParameterizationEnum) {
+                                iomodel->FetchDataToInput(inputs,elements,"md.frontalforcings.ablationrate",CalvingAblationrateEnum);
+                        }
                         break;
                 case FrontalForcingsRignotEnum:

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

@@ -42 +42 @@
 
                         md = checkfield(md,'fieldname','frontalforcings.meltingrate','NaN',1,'Inf',1,'timeseries',1,'>=',0);
-                        md = checkfield(md,'fieldname','frontalforcings.ablationrate','NaN',1,'Inf',1,'timeseries',1);
+                        if ~isnan(md.frontalforcings.ablationrate)
+                                md = checkfield(md,'fieldname','frontalforcings.ablationrate','Inf',1,'timeseries',1);
+                        end
 
                 end % }}}
@@ -54 +56 @@
                         WriteData(fid,prefix,'name','md.frontalforcings.parameterization','data',1,'format','Integer');
                         WriteData(fid,prefix,'object',self,'fieldname','meltingrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
-                        WriteData(fid,prefix,'object',self,'fieldname','ablationrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
+                        if ~isnan(md.frontalforcings.ablationrate)
+                                WriteData(fid,prefix,'object',self,'fieldname','ablationrate','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts,'scale',1./yts);
+                        end
                 end % }}}
         end