Changeset 25681

Timestamp:

10/12/20 13:34:18 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moulin can be time series

File:

• issm/trunk-jpl/src/m/classes/hydrologyglads.m (modified) (2 diffs)

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

@@ -77 +77 @@
                         md = checkfield(md,'fieldname','hydrology.spcphi','Inf',1,'timeseries',1);
                         md = checkfield(md,'fieldname','hydrology.englacial_void_ratio','numel',[1],'>=',0);
-                        md = checkfield(md,'fieldname','hydrology.moulin_input','size',[md.mesh.numberofvertices 1],'>=',0,'NaN',1,'Inf',1);
+                        md = checkfield(md,'fieldname','hydrology.moulin_input','>=',0,'timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1);
                         md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1);
@@ -124 +124 @@
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','spcphi','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','neumannflux','format','DoubleMat','mattype',2,'timeserieslength',md.mesh.numberofelements+1,'yts',md.constants.yts);
-                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1);
+                        WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts);
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','englacial_void_ratio','format','Double');
                         WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','melt_flag','format','Boolean');