Index: /issm/trunk-jpl/test/NightlyRun/runme.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/runme.py (revision 27166) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 27167) @@ -365,5 +365,5 @@ field = field.T if np.shape(field) != np.shape(archive): - raise RuntimeError("Field '{}' from test is malformed; shape is {}, should be {} or {}".format(archive_name, np.shape(field.T), np.shape(archive), np.shape(archive.T))) + raise RuntimeError("Field '{}' from test {} is malformed; shape is {}, should be {} or {}".format(fieldname, archive_name[7:], np.shape(field.T), np.shape(archive), np.shape(archive.T))) error_diff = np.amax(np.abs(archive - field), axis=0) / (np.amax(np.abs(archive), axis=0) + float_info.epsilon) Index: /issm/trunk-jpl/test/NightlyRun/test2004.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2004.m (revision 27166) +++ /issm/trunk-jpl/test/NightlyRun/test2004.m (revision 27167) @@ -7,8 +7,8 @@ %}}} -%create sealevel model to hold our information: +%create sealevel model to hold our information: sl=sealevelmodel(); -%Create basins using boundaries from shapefile: +%Create basins using boundaries from shapefile: %some projections we'll rely on: %{{{ proj4326=epsg2proj(4326); @@ -71,8 +71,8 @@ %Go through basins and mesh: %{{{ %meshing parameters: {{{ -hmin=500; hmax=700; hmin=hmin*1000; hmax=hmax*1000; +hmin=500; hmax=700; hmin=hmin*1000; hmax=hmax*1000; tolerance=100; %tolerance of 100m on Earth position when merging 3d meshes threshold=5; -defaultoptions={'KeepVertices',0,'MaxCornerAngle',0.0000000001,'NoBoundaryRefinement',1}; +defaultoptions={'KeepVertices',0,'MaxCornerAngle',0.0000000001,'NoBoundaryRefinement',1}; alreadyloaded=0; %}}} @@ -82,5 +82,5 @@ disp(sprintf('Meshing basin %s\n',bas.name)); - %recover basin domain: + %recover basin domain: domain=bas.contour(); @@ -92,9 +92,9 @@ %plotmodel(md,'data','mesh');pause(1); - %miscellaneous: + %miscellaneous: md.mesh.proj=bas.proj; md.miscellaneous.name=bas.name; - %recover mask where we have land: + %recover mask where we have land: md.private.bamg.landmask=double(md.private.bamg.mesh.Triangles(:,4)>=1); @@ -107,5 +107,5 @@ %}}} -%Parameterization: +%Parameterization: %Parameterize ice sheets : {{{ for ind=sl.basinindx('continent',{'antarctica'}), @@ -113,13 +113,13 @@ md=sl.icecaps{ind}; - bas=sl.basins{ind}; + bas=sl.basins{ind}; %masks : %{{{ - %ice levelset from domain outlines: + %ice levelset from domain outlines: md.mask.ice_levelset=-ones(md.mesh.numberofvertices,1); - - if bas.isnameany('antarctica-grounded'), + + if bas.isnameany('antarctica-grounded'), md.mask.ocean_levelset=ones(md.mesh.numberofvertices,1); end - if bas.isnameany('ronne','ross'), + if bas.isnameany('ronne','ross'), md.mask.ocean_levelset=-ones(md.mesh.numberofvertices,1); end @@ -161,5 +161,5 @@ % index=delaunayn(points); index=BamgTriangulate(longAIS, latAIS); - lat=md.mesh.lat; + lat=md.mesh.lat; long=md.mesh.long+360; pos=find(long>360); @@ -195,9 +195,9 @@ bas=sl.basins{ind}; - %recover lat,long: + %recover lat,long: [md.mesh.long,md.mesh.lat]=gdaltransform(md.mesh.x,md.mesh.y,md.mesh.proj,'EPSG:4326'); %mask: %{{{ - %Figure out mask from initial mesh: deal with land and ocean masks (land + %Figure out mask from initial mesh: deal with land and ocean masks (land %includes grounded ice). %{{{ %first, transform land element mask into vertex-driven one @@ -213,5 +213,5 @@ sumconnectedisonocean=sum(connectedisonocean,2); - %figure out which land elements are connected to the ocean: + %figure out which land elements are connected to the ocean: landelsconocean=landels(find(sumconnectedisonocean)); @@ -223,5 +223,5 @@ md.mesh.elements(landelsconocean,1)]; - %edge ind1 and ind2: + %edge ind1 and ind2: for i=1:length(ind1), els1=md.mesh.vertexconnectivity(ind1(i),1: md.mesh.vertexconnectivity(ind1(i),end)); @@ -230,5 +230,5 @@ if length(find(land(els)))==1, - %this edge is on the beach, 0 the edge: + %this edge is on the beach, 0 the edge: land_mask(ind1(i))=0; land_mask(ind2(i))=0; @@ -237,5 +237,5 @@ md.mask.ocean_levelset=land_mask; - md.mask.ice_levelset=ones(md.mesh.numberofvertices,1); %if there are glaciers, we'll adjust + md.mask.ice_levelset=ones(md.mesh.numberofvertices,1); %if there are glaciers, we'll adjust if testagainst2002, @@ -251,5 +251,5 @@ md.masstransport.spcthickness=zeros(md.mesh.numberofvertices,1); - if testagainst2002, + if testagainst2002, % {{{ %greenland @@ -261,5 +261,5 @@ %md.masstransport.spcthickness(pos)=-100*ratio; - %correct mask: + %correct mask: md.mask.ice_levelset(md.mesh.elements(pos,:))=-1; % }}} @@ -281,6 +281,6 @@ delHGLA=sum(delH(:,3:end),2); index=BamgTriangulate(longGLA, latGLA); - lat=md.mesh.lat; - long=md.mesh.long+360; + lat=md.mesh.lat; + long=md.mesh.long+360; pos=find(long>360); long(pos)=long(pos)-360; @@ -292,6 +292,6 @@ md.masstransport.spcthickness(pos)= md.masstransport.spcthickness(pos)-delHGLA(pos)/100; - %adjust mask accordingly: - pos=find(md.masstransport.spcthickness); + %adjust mask accordingly: + pos=find(md.masstransport.spcthickness); md.mask.ice_levelset(pos)=-1; md.mask.ocean_levelset(pos)=1; @@ -322,16 +322,16 @@ %%Assemble Earth in 3D {{{ -%parameters: +%parameters: plotting=0; tolerance=100; -loneedgesdetect=0; - -%create Earth model by concatenating all the icecaps in 3D: +loneedgesdetect=0; + +%create Earth model by concatenating all the icecaps in 3D: sl.caticecaps('tolerance',tolerance,'loneedgesdetect',loneedgesdetect); -%figure out how each icecap's mesh connects to the larger Earth mesh: +%figure out how each icecap's mesh connects to the larger Earth mesh: sl.intersections('force',1); -%figure out connectivity: +%figure out connectivity: disp('Mesh connectivity'); sl.earth.mesh.vertexconnectivity=NodeConnectivity(sl.earth.mesh.elements,sl.earth.mesh.numberofvertices); @@ -341,5 +341,5 @@ sl.earth.mesh.area=averaging(sl.earth,GetAreas3DTria(sl.earth.mesh.elements,sl.earth.mesh.x,sl.earth.mesh.y,sl.earth.mesh.z),4); -%transfer a list of fields from each icecap and continent back to Earth: +%transfer a list of fields from each icecap and continent back to Earth: sl.transfer('mask.ice_levelset'); sl.transfer('mask.ocean_levelset'); @@ -355,5 +355,5 @@ sl.transfer('dsl.sea_water_pressure_at_sea_floor'); -%radius: +%radius: sl.earth.mesh.r=sqrt(sl.earth.mesh.x.^2+sl.earth.mesh.y.^2+sl.earth.mesh.z.^2); @@ -373,10 +373,10 @@ md=sl.earth; %we don't do computations on ice sheets or land. -%Materials: +%Materials: md.materials=materials('hydro'); -%elastic loading from love numbers: +%elastic loading from love numbers: md.solidearth.lovenumbers=lovenumbers('maxdeg',100); -md.solidearth.settings.ocean_area_scaling = 0; +md.solidearth.settings.ocean_area_scaling = 0; %Miscellaneous @@ -395,6 +395,6 @@ md.timestepping.time_step=1; -%Physics: -md.transient.issmb=0; +%Physics: +md.transient.issmb=0; md.transient.isstressbalance=0; md.transient.isthermal=0; @@ -402,5 +402,5 @@ md.transient.isslc=1; -%Initializations: +%Initializations: md.basalforcings.groundedice_melting_rate=zeros(md.mesh.numberofvertices,1); md.basalforcings.floatingice_melting_rate=zeros(md.mesh.numberofvertices,1); Index: /issm/trunk-jpl/test/NightlyRun/test2004.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2004.py (revision 27166) +++ /issm/trunk-jpl/test/NightlyRun/test2004.py (revision 27167) @@ -2,7 +2,7 @@ # # TODO: -# - Save boundaries by name to some data structure with tag so that they can be -# copied to basins that use identical shapefiles and projections (will need -# to check if the cost of the additional structure, checks, and copying are +# - Save boundaries by name to some data structure with tag so that they can be +# copied to basins that use identical shapefiles and projections (will need +# to check if the cost of the additional structure, checks, and copying are # greater than the cost of projecting). # @@ -41,5 +41,5 @@ #HemisphereWest #{{{ sl.addbasin( - basin('continent', 'hemispherewest', 'name', 'hemispherewest', 'proj', laea(0, -90), 'boundaries', [ # Peru projection 3587 + basin('continent', 'hemispherewest', 'name', 'hemispherewest', 'proj', laea(0, -90), 'boundaries', [ # Peru projection 3587 boundary('shppath', shppath, 'shpfilename', 'HemisphereSplit', 'proj', proj4326, 'orientation', 'reverse'), boundary('shppath', shppath, 'shpfilename', 'NorthAntarctica', 'proj', proj3031), @@ -49,6 +49,5 @@ boundary('shppath', shppath, 'shpfilename', 'RonneWestSummit', 'proj', proj3031), boundary('shppath', shppath, 'shpfilename', 'WestAntarctica2', 'proj', proj3031, 'orientation', 'reverse'), - boundary('shppath', shppath, 'shpfilename', 'SouthAntarctica', 'proj', proj3031) - ] + boundary('shppath', shppath, 'shpfilename', 'SouthAntarctica', 'proj', proj3031)] ) ) @@ -59,7 +58,6 @@ boundary('shppath', shppath, 'shpfilename', 'SouthAntarctica', 'proj', proj3031), boundary('shppath', shppath, 'shpfilename', 'RossIceShelf', 'proj', proj3031), - boundary('shppath', shppath, 'shpfilename', 'RossWestFront','proj', proj3031), - boundary('shppath', shppath, 'shpfilename', 'RossFront', 'proj', proj3031, 'orientation', 'reverse') - ] + boundary('shppath', shppath, 'shpfilename', 'RossWestFront', 'proj', proj3031), + boundary('shppath', shppath, 'shpfilename', 'RossFront', 'proj', proj3031, 'orientation', 'reverse')] ) ) @@ -67,12 +65,11 @@ #HemisphereEast: {{{ sl.addbasin( - basin('continent', 'hemisphereeast', 'name', 'hemisphereeast', 'proj', laea(0, +90), 'boundaries', [ #Australian projection lat, long + basin('continent', 'hemisphereeast', 'name', 'hemisphereeast', 'proj', laea(0, +90), 'boundaries', [ #Australian projection lat, long boundary('shppath', shppath, 'shpfilename', 'HemisphereSplit', 'proj', proj4326), boundary('shppath', shppath, 'shpfilename', 'SouthAntarctica', 'proj', proj3031), - boundary('shppath', shppath, 'shpfilename','RossFront', 'proj', proj3031), + boundary('shppath', shppath, 'shpfilename', 'RossFront', 'proj', proj3031), boundary('shppath', shppath, 'shpfilename', 'RossWestFront', 'proj', proj3031), - boundary('shppath', shppath, 'shpfilename', 'EastAntarctica2', 'proj', proj3031,'orientation', 'reverse'), - boundary('shppath', shppath, 'shpfilename', 'NorthAntarctica', 'proj', proj3031) - ] + boundary('shppath', shppath, 'shpfilename', 'EastAntarctica2', 'proj', proj3031, 'orientation', 'reverse'), + boundary('shppath', shppath, 'shpfilename', 'NorthAntarctica', 'proj', proj3031)] ) ) @@ -90,6 +87,5 @@ boundary('shppath', shppath, 'shpfilename', 'RonneIceShelf', 'proj', proj3031), boundary('shppath', shppath, 'shpfilename', 'RonneEastSummit', 'proj', proj3031), - boundary('shppath', shppath, 'shpfilename', 'RonneBrunt', 'proj', proj3031) - ] + boundary('shppath', shppath, 'shpfilename', 'RonneBrunt', 'proj', proj3031)] ) ) @@ -101,6 +97,5 @@ boundary('shppath', shppath, 'shpfilename', 'RonneIceShelf', 'proj', proj3031), boundary('shppath', shppath, 'shpfilename', 'RonneEastSummit', 'proj', proj3031), - boundary('shppath', shppath, 'shpfilename', 'RonneFront', 'proj', proj3031, 'orientation', 'reverse') - ] + boundary('shppath', shppath, 'shpfilename', 'RonneFront', 'proj', proj3031, 'orientation', 'reverse')] ) ) @@ -114,11 +109,9 @@ hmin = hmin * 1000 hmax = hmax * 1000 -tolerance = 100 # tolerance of 100m on Earth position when merging 3d meshes +tolerance = 100 # tolerance of 100m on Earth position when merging 3d meshes threshold = 5 -defaultoptions = [ - 'KeepVertices', 0, - 'MaxCornerAngle', 0.0000000001, - 'NoBoundaryRefinement', 1 -] +defaultoptions = ['KeepVertices', 0, + 'MaxCornerAngle', 0.0000000001, + 'NoBoundaryRefinement', 1] alreadyloaded = 0 #}}} @@ -134,5 +127,5 @@ # Mesh - md = bamg(model(), 'domain', domain, 'subdomains', coastline, 'hmin', hmin, 'hmax', hmax, *defaultoptions) # NOTE: Unpacking defaultoptions with '*' + md = bamg(model(), 'domain', domain, 'subdomains', coastline, 'hmin', hmin, 'hmax', hmax, *defaultoptions) # NOTE: Unpacking defaultoptions with '*' # Miscellaneous @@ -254,14 +247,10 @@ landelsconocean = landels[np.nonzero(sumconnectedisonocean)[0]] - ind1 = np.hstack(( - md.mesh.elements[landelsconocean, 0], - md.mesh.elements[landelsconocean, 1], - md.mesh.elements[landelsconocean, 2] - )) - ind2 = np.hstack(( - md.mesh.elements[landelsconocean, 1], - md.mesh.elements[landelsconocean, 2], - md.mesh.elements[landelsconocean, 0] - )) + ind1 = np.hstack((md.mesh.elements[landelsconocean, 0], + md.mesh.elements[landelsconocean, 1], + md.mesh.elements[landelsconocean, 2])) + ind2 = np.hstack((md.mesh.elements[landelsconocean, 1], + md.mesh.elements[landelsconocean, 2], + md.mesh.elements[landelsconocean, 0])) # Edge ind1 and ind2 @@ -325,6 +314,6 @@ delHGLA = InterpFromMeshToMesh2d(index, longGLA, latGLA, delHGLA, longe, late) - # NOTE: For some reason, cannot apply pos to multiple arrays in a - # singlelike we might do in MATLAB. Instead, we iterate over + # NOTE: For some reason, cannot apply pos to multiple arrays in a + # singlelike we might do in MATLAB. Instead, we iterate over # elements of pos. # @@ -461,12 +450,10 @@ md.solidearth.settings.rotation = 0 md.solidearth.settings.viscous = 0 -md.solidearth.requested_outputs = [ - 'default', - 'DeltaIceThickness', - 'Sealevel', - 'Bed', - 'SealevelBarystaticIceMask', - 'SealevelBarystaticOceanMask', -] +md.solidearth.requested_outputs = ['default', + 'DeltaIceThickness', + 'Sealevel', + 'Bed', + 'SealevelBarystaticIceMask', + 'SealevelBarystaticOceanMask'] md = solve(md, 'Transient') Seustatic = md.results.TransientSolution.Sealevel Index: /issm/trunk-jpl/test/NightlyRun/test243.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test243.py (revision 27166) +++ /issm/trunk-jpl/test/NightlyRun/test243.py (revision 27167) @@ -2,7 +2,5 @@ from socket import gethostname import sys - import numpy as np - from model import * from parameterize import * @@ -44,12 +42,10 @@ #smb settings -md.smb.requested_outputs = [ - 'SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC', - 'SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF', - 'SmbMeanULW','SmbNetLW','SmbNetSW','SmbWAdd','SmbRunoff','SmbRefreeze','SmbMelt', - 'SmbEC','SmbPrecipitation','SmbRain','SmbAccumulatedMassBalance','SmbAccumulatedRunoff', - 'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain', - 'SmbAccumulatedPrecipitation','SmbAccumulatedRefreeze' - ] +md.smb.requested_outputs = ['SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbEC', + 'SmbA','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF', + 'SmbMeanULW','SmbNetLW','SmbNetSW','SmbWAdd','SmbRunoff','SmbRefreeze','SmbMelt', + 'SmbEC','SmbPrecipitation','SmbRain','SmbAccumulatedMassBalance','SmbAccumulatedRunoff', + 'SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain', + 'SmbAccumulatedPrecipitation','SmbAccumulatedRefreeze'] #only run smb core: @@ -72,5 +68,5 @@ #Fields and tolerances to track changes -field_names = ['Layers','SmbDz','SmbT','SmbD','SmbRe','SmbGdn','SmbGsp','SmbA' ,'SmbEC','SmbMassBalance','SmbMAdd','SmbDzAdd','SmbFAC','SmbMeanSHF','SmbMeanLHF','SmbMeanULW','SmbNetLW','SmbNetSW','SmbAccumulatedMassBalance','SmbAccumulatedRunoff','SmbAccumulatedMelt','SmbAccumulatedEC','SmbAccumulatedPrecipitation','SmbAccumulatedRain','SmbAccumulatedRefreeze','SmbRunoff','SmbMelt','SmbEC','SmbPrecipitation','SmbRain','SmbRefreeze','SmbWAdd'] +field_names = ['Layers', 'SmbDz', 'SmbT', 'SmbD', 'SmbRe', 'SmbGdn', 'SmbGsp', 'SmbA', 'SmbEC', 'SmbMassBalance', 'SmbMAdd', 'SmbDzAdd', 'SmbFAC', 'SmbMeanSHF', 'SmbMeanLHF', 'SmbMeanULW', 'SmbNetLW', 'SmbNetSW', 'SmbAccumulatedMassBalance', 'SmbAccumulatedRunoff', 'SmbAccumulatedMelt', 'SmbAccumulatedEC', 'SmbAccumulatedPrecipitation', 'SmbAccumulatedRain', 'SmbAccumulatedRefreeze', 'SmbRunoff', 'SmbMelt', 'SmbEC', 'SmbPrecipitation', 'SmbRain', 'SmbRefreeze', 'SmbWAdd'] field_tolerances = [1e-12, 2e-12, 1e-12, 2e-11, 1e-11, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, 2e-11, 2e-11, 1e-11, 9e-10, 2e-11, 1e-11, 9e-10, 2e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11, 1e-11] Index: /issm/trunk-jpl/test/NightlyRun/test252.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test252.py (revision 27166) +++ /issm/trunk-jpl/test/NightlyRun/test252.py (revision 27167) @@ -79,60 +79,56 @@ 'SmbDz3', 'SmbT3', 'SmbD3', 'SmbRe3', 'SmbGdn3', 'SmbGsp3', 'SmbA3', 'SmbEC3', 'SmbMassBalance3', 'SmbMAdd3', 'SmbDzAdd3', 'SmbFAC3', 'SmbDz4', 'SmbT4', 'SmbD4', 'SmbRe4', 'SmbGdn4', 'SmbGsp4', 'SmbA4', 'SmbEC4', 'SmbMassBalance4', 'SmbMAdd4', 'SmbDzAdd4', 'SmbFAC4'] -field_tolerances = [ - 1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12,1e-12, - 1e-12,1e-12,1e-11,1e-10,2e-11,1e-11,1e-12,1e-11,1e-12,1e-12,1e-12,1e-11, - 1e-12,1e-12,2e-12,2e-11,4e-11,1e-11,1e-12,1e-11,1e-11,1e-12,1e-12,1e-11, - 1e-11,1e-11,4e-11,4e-11,1e-12,4e-11,1e-12,3e-12,1e-10,1e-12,1e-12,2e-11 -] +field_tolerances = [1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, 1e-12, + 1e-12, 1e-12, 1e-11, 1e-10, 2e-11, 1e-11, 1e-12, 1e-11, 1e-12, 1e-12, 1e-12, 1e-11, + 1e-12, 1e-12, 2e-12, 2e-11, 4e-11, 1e-11, 1e-12, 1e-11, 1e-11, 1e-12, 1e-12, 1e-11, + 1e-11, 1e-11, 4e-11, 4e-11, 1e-12, 4e-11, 1e-12, 3e-12, 1e-10, 1e-12, 1e-12, 2e-11] # Shape is different in python solution (fixed using reshape) which can cause test failure -field_values = [ - nlayers, - md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[0].SmbEC[0], - md.results.TransientSolution[0].SmbMassBalance[0], - md.results.TransientSolution[0].SmbMAdd[0], - md.results.TransientSolution[0].SmbDzAdd[0], - md.results.TransientSolution[0].SmbFAC[0], - md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[145].SmbEC[0], - md.results.TransientSolution[145].SmbMassBalance[0], - md.results.TransientSolution[145].SmbMAdd[0], - md.results.TransientSolution[145].SmbDzAdd[0], - md.results.TransientSolution[145].SmbFAC[0], - md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[146].SmbEC[0], - md.results.TransientSolution[146].SmbMassBalance[0], - md.results.TransientSolution[146].SmbMAdd[0], - md.results.TransientSolution[146].SmbDzAdd[0], - md.results.TransientSolution[146].SmbFAC[0], - md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1), - md.results.TransientSolution[-1].SmbEC[0], - md.results.TransientSolution[-1].SmbMassBalance[0], - md.results.TransientSolution[-1].SmbMAdd[0], - md.results.TransientSolution[-1].SmbDzAdd[0], - md.results.TransientSolution[-1].SmbFAC[0] -] +field_values = [nlayers, + md.results.TransientSolution[0].SmbDz[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbT[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbD[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbRe[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbGdn[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbGsp[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbA[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[0].SmbEC[0], + md.results.TransientSolution[0].SmbMassBalance[0], + md.results.TransientSolution[0].SmbMAdd[0], + md.results.TransientSolution[0].SmbDzAdd[0], + md.results.TransientSolution[0].SmbFAC[0], + md.results.TransientSolution[145].SmbDz[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbT[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbD[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbRe[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbGdn[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbGsp[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbA[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[145].SmbEC[0], + md.results.TransientSolution[145].SmbMassBalance[0], + md.results.TransientSolution[145].SmbMAdd[0], + md.results.TransientSolution[145].SmbDzAdd[0], + md.results.TransientSolution[145].SmbFAC[0], + md.results.TransientSolution[146].SmbDz[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbT[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbD[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbRe[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbGdn[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbGsp[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbA[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[146].SmbEC[0], + md.results.TransientSolution[146].SmbMassBalance[0], + md.results.TransientSolution[146].SmbMAdd[0], + md.results.TransientSolution[146].SmbDzAdd[0], + md.results.TransientSolution[146].SmbFAC[0], + md.results.TransientSolution[-1].SmbDz[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbT[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbD[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbRe[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbGdn[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbGsp[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbA[0, 0:nlayers].reshape(1, -1), + md.results.TransientSolution[-1].SmbEC[0], + md.results.TransientSolution[-1].SmbMassBalance[0], + md.results.TransientSolution[-1].SmbMAdd[0], + md.results.TransientSolution[-1].SmbDzAdd[0], + md.results.TransientSolution[-1].SmbFAC[0]]