Index: ../trunk-jpl/test/NightlyRun/test202.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test202.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test202.py (revision 13491) @@ -0,0 +1,42 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test202.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,2) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ + md.results['DiagnosticSolution'][1]['Vz'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test211.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test211.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test211.py (revision 13491) @@ -0,0 +1,74 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test211.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',200000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'stokes','all') +md.diagnostic.reltol=NaN +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names=[\ + 'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'] +field_tolerances=[\ + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\ + 1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,\ + 1e-07,1e-07,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test208.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test208.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test208.py (revision 13491) @@ -0,0 +1,57 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test208.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',150000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test203.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test203.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test203.py (revision 13491) @@ -0,0 +1,42 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test203.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,2) +md=setflowequation(md,'pattyn','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09] +field_values=[\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ + md.results['DiagnosticSolution'][1]['Vz'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test206.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test206.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test206.py (revision 13491) @@ -0,0 +1,40 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test206.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.timestepping.time_step=0 +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,ThermalSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Temperature','BasalforcingsMeltingRate'] +field_tolerances=[1e-13,1e-13] +field_values=[\ + md.results['ThermalSolution'][1]['Temperature'],\ + md.results['ThermalSolution'][1]['BasalforcingsMeltingRate'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test209.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test209.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test209.py (revision 13491) @@ -0,0 +1,72 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test209.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'] +field_tolerances=[\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\ + 1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\ + 1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test210.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test210.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test210.py (revision 13491) @@ -0,0 +1,72 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test210.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',200000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'pattyn','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,TransientSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \ + 'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \ + 'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3'] +field_tolerances=[\ + 1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\ + 1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\ + 1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05] +field_values=[\ + md.results['TransientSolution'][1]['Vx'],\ + md.results['TransientSolution'][1]['Vy'],\ + md.results['TransientSolution'][1]['Vz'],\ + md.results['TransientSolution'][1]['Vel'],\ + md.results['TransientSolution'][1]['Pressure'],\ + md.results['TransientSolution'][1]['Bed'],\ + md.results['TransientSolution'][1]['Surface'],\ + md.results['TransientSolution'][1]['Thickness'],\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Vx'],\ + md.results['TransientSolution'][2]['Vy'],\ + md.results['TransientSolution'][2]['Vz'],\ + md.results['TransientSolution'][2]['Vel'],\ + md.results['TransientSolution'][2]['Pressure'],\ + md.results['TransientSolution'][2]['Bed'],\ + md.results['TransientSolution'][2]['Surface'],\ + md.results['TransientSolution'][2]['Thickness'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Vx'],\ + md.results['TransientSolution'][3]['Vy'],\ + md.results['TransientSolution'][3]['Vz'],\ + md.results['TransientSolution'][3]['Vel'],\ + md.results['TransientSolution'][3]['Pressure'],\ + md.results['TransientSolution'][3]['Bed'],\ + md.results['TransientSolution'][3]['Surface'],\ + md.results['TransientSolution'][3]['Thickness'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test204.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test204.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test204.py (revision 13491) @@ -0,0 +1,42 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test204.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,2) +md=setflowequation(md,'stokes','all') +md.cluster=generic('name',oshostname(),'np',3) +md=solve(md,DiagnosticSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Vx','Vy','Vz','Vel','Pressure'] +field_tolerances=[1e-08,1e-08,1e-07,1e-08,1e-08] +field_values=[\ + md.results['DiagnosticSolution'][1]['Vx'],\ + md.results['DiagnosticSolution'][1]['Vy'],\ + md.results['DiagnosticSolution'][1]['Vz'],\ + md.results['DiagnosticSolution'][1]['Vel'],\ + md.results['DiagnosticSolution'][1]['Pressure'],\ + ] Index: ../trunk-jpl/test/NightlyRun/test207.py =================================================================== --- ../trunk-jpl/test/NightlyRun/test207.py (revision 0) +++ ../trunk-jpl/test/NightlyRun/test207.py (revision 13491) @@ -0,0 +1,47 @@ +""" +== == == == == == == == == == == == == == == == == == == +Auto generated python script for ISSM: test207.m +Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep +== == == == == == == == == == == == == == == == == == == + +Matlab script conversion into python +translateToPy.py Author: Michael Pellegrin +translateToPy.py Date: 09/24/12 +== == == == == == == == == == == == == == == == == == == +""" + +from MatlabFuncs import * +from model import * +from EnumDefinitions import * +from numpy import * +from triangle import * +from setmask import * +from parameterize import * +from setflowequation import * +from solve import * + +md=triangle(model(),'../Exp/Square.exp',180000) +md=setmask(md,'all','') +md=parameterize(md,'../Par/SquareShelf.py') +md.extrude(3,1) +md=setflowequation(md,'macayeal','all') +md.cluster=generic('name',oshostname(),'np',3) +md.transient.isdiagnostic=0 +md.transient.isprognostic=0 +md.transient.isthermal=1 +md.transient.isgroundingline=0 +md=solve(md,TransientSolutionEnum()) + + +# Fields and tolerances to track changes + +field_names =['Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3'] +field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13] +field_values=[\ + md.results['TransientSolution'][1]['Temperature'],\ + md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][2]['Temperature'],\ + md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\ + md.results['TransientSolution'][3]['Temperature'],\ + md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\ + ] Index: ../trunk-jpl/scripts/translateToPy.py =================================================================== --- ../trunk-jpl/scripts/translateToPy.py (revision 13490) +++ ../trunk-jpl/scripts/translateToPy.py (revision 13491) @@ -66,12 +66,31 @@ res = res.replace('thickness(pos)','thickness[pos]') res = res.replace('find(md.','numpy.nonzero(md.') + res = res.replace('\n','') + + # handle inline comments + res = res.replace('%','#') + res = res.replace('...','\\') + + # determine if the m file has mult. line cmd (real quick solution) + multCmds = res.split(';') + numLines = len( multCmds ) - 2 + allParts = '' + for part in multCmds: + allParts += part + #allParts += re.sub('^\s+','',part) + #allParts += part.strip() + if numLines > 0: + allParts += '\n' + numLines -= 1 + res = allParts + res = res.replace(';','') - res = res.replace('\n','') + res = convertFieldValues( res ) - + #print 'resulting line:' + str(res) + '\n' output(res) def convertFieldValues ( currentLine ): @@ -103,6 +122,19 @@ res = res.replace('Solution.StressTensorxz)','Solution\'][1][\'StressTensorxz\']') res = res.replace('Solution.StressTensoryz)','Solution\'][1][\'StressTensoryz\']') + res = res.replace('Solution.FrictionCoefficient)','Solution\'][1][\'FrictionCoefficient\']') + res = res.replace('Solution.SurfaceforcingsMasBalance)','Solution\'][1][\'SurfaceforcingsMasBalance\']') + res = res.replace('Solution.MaskElementonfloatingice)','Solution\'][1][\'MaskElementonfloatingice\']') + res = res.replace('Solution.J)','Solution\'][1][\'J\']') + res = res.replace('Solution.BalancethicknessThickeningRate)','Solution\'][1][\'BalancethicknessThickeningRate\']') + + res = res.replace('Solution.Gradient1)','Solution\'][1][\'Gradient1\']') + res = res.replace('Solution.Gradient2)','Solution\'][1][\'Gradient2\']') + + res = res.replace('Solution.MaterialsRheologyZbar)','Solution\'][1][\'MaterialsRheologyZbar\']') + res = res.replace('Solution.MaterialsRheologyBbar)','Solution\'][1][\'MaterialsRheologyBbar\']') + res = res.replace('Solution.MaterialsRheologyB)','Solution\'][1][\'MaterialsRheologyB\']') + res = res.replace('Solution.Thickness)','Solution\'][1][\'Thickness\']') res = res.replace('Solution.Temperature)','Solution\'][1][\'Temperature\']') @@ -120,6 +152,10 @@ res = res.replace('Solution.Enthalpy)','Solution\'][1][\'Enthalpy\']') res = res.replace('Solution.Waterfraction)','Solution\'][1][\'Waterfraction\']') res = res.replace('Solution.Temperature)','Solution\'][1][\'Temperature\']') + + # special case + res = res.replace('.DiagnosticSolution.J','[\'DiagnosticSolution\'][1][\'J\']') + return res def output ( line ):