From 2f757f0f51bdf97a494831c0e5a14ac6e3353d32 Mon Sep 17 00:00:00 2001 From: mmorligh Date: Thu, 23 Jan 2025 14:56:09 -0500 Subject: [PATCH] CHG: allow spchead to be a time dependent input --- src/m/classes/hydrologyshakti.m | 4 ++-- src/m/classes/hydrologyshakti.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/m/classes/hydrologyshakti.m b/src/m/classes/hydrologyshakti.m index ecaea05d9..cac338596 100644 --- a/src/m/classes/hydrologyshakti.m +++ b/src/m/classes/hydrologyshakti.m @@ -65,7 +65,7 @@ md = checkfield(md,'fieldname','hydrology.moulin_input','>=',0,'NaN',1,'Inf',1,'timeseries',1); md = checkfield(md,'fieldname','hydrology.reynolds','>',0,'size',[md.mesh.numberofelements 1],'NaN',1,'Inf',1); md = checkfield(md,'fieldname','hydrology.neumannflux','timeseries',1,'NaN',1,'Inf',1); - md = checkfield(md,'fieldname','hydrology.spchead','size',[md.mesh.numberofvertices 1]); + md = checkfield(md,'fieldname','hydrology.spchead','Inf',1,'timeseries',1); md = checkfield(md,'fieldname','hydrology.relaxation','>=',0); md = checkfield(md,'fieldname','hydrology.storage','>=',0); md = checkfield(md,'fieldname','hydrology.requested_outputs','stringrow',1); @@ -98,7 +98,7 @@ function marshall(self,prefix,md,fid) % {{{ WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','moulin_input','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','reynolds','format','DoubleMat','mattype',2); 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','spchead','format','DoubleMat','mattype',1); + WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','spchead','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','relaxation','format','Double'); WriteData(fid,prefix,'object',self,'class','hydrology','fieldname','storage','format','Double'); outputs = self.requested_outputs; diff --git a/src/m/classes/hydrologyshakti.py b/src/m/classes/hydrologyshakti.py index f21d55a58..f994c02c2 100644 --- a/src/m/classes/hydrologyshakti.py +++ b/src/m/classes/hydrologyshakti.py @@ -76,7 +76,7 @@ def checkconsistency(self, md, solution, analyses): # {{{ md = checkfield(md, 'fieldname', 'hydrology.moulin_input', '>=', 0, 'NaN', 1, 'Inf', 1, 'timeseries', 1) md = checkfield(md, 'fieldname', 'hydrology.reynolds', '>', 0, 'size', [md.mesh.numberofelements], 'NaN', 1, 'Inf', 1) md = checkfield(md, 'fieldname', 'hydrology.neumannflux', 'timeseries', 1, 'NaN', 1, 'Inf', 1) - md = checkfield(md, 'fieldname', 'hydrology.spchead', 'size', [md.mesh.numberofvertices]) + md = checkfield(md, 'fieldname', 'hydrology.spchead', 'Inf', 1, 'timeseries', 1) md = checkfield(md, 'fieldname', 'hydrology.relaxation', '>=', 0) md = checkfield(md, 'fieldname', 'hydrology.storage', '>=', 0) md = checkfield(md, 'fieldname', 'hydrology.requested_outputs', 'stringrow', 1) @@ -95,7 +95,7 @@ def marshall(self, prefix, md, fid): # {{{ WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'moulin_input', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', yts) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'reynolds', 'format', 'DoubleMat', 'mattype', 2) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'neumannflux', 'format', 'DoubleMat', 'mattype', 2, 'timeserieslength', md.mesh.numberofelements + 1, 'yts', yts) - WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'spchead', 'format', 'DoubleMat', 'mattype', 1) + WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'spchead', 'format', 'DoubleMat', 'mattype', 1, 'timeserieslength', md.mesh.numberofvertices + 1, 'yts', md.constants.yts) WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'relaxation', 'format', 'Double') WriteData(fid, prefix, 'object', self, 'class', 'hydrology', 'fieldname', 'storage', 'format', 'Double') #process requested outputs