source: issm/oecreview/Archive/13393-13976/ISSM-13490-13491.diff

Last change on this file was 13980, checked in by Mathieu Morlighem, 12 years ago

preparing oecreview for 13393-13976'
File size: 22.9 KB

  • ../trunk-jpl/test/NightlyRun/test202.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test202.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,2)
     27md=setflowequation(md,'macayeal','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md=solve(md,DiagnosticSolutionEnum())
     30
     31
     32# Fields and tolerances to track changes
     33
     34field_names     =['Vx','Vy','Vz','Vel','Pressure']
     35field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13]
     36field_values=[\
     37        md.results['DiagnosticSolution'][1]['Vx'],\
     38        md.results['DiagnosticSolution'][1]['Vy'],\
     39        md.results['DiagnosticSolution'][1]['Vz'],\
     40        md.results['DiagnosticSolution'][1]['Vel'],\
     41        md.results['DiagnosticSolution'][1]['Pressure'],\
     42        ]

  • ../trunk-jpl/test/NightlyRun/test211.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test211.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',200000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,1)
     27md=setflowequation(md,'stokes','all')
     28md.diagnostic.reltol=NaN
     29md.cluster=generic('name',oshostname(),'np',3)
     30md=solve(md,TransientSolutionEnum())
     31
     32
     33# Fields and tolerances to track changes
     34
     35field_names=[\
     36        'Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
     37        'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
     38        'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     39field_tolerances=[\
     40        1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,\
     41        1e-08,1e-08,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06,\
     42        1e-07,1e-07,1e-06,1e-08,1e-08,1e-08,1e-08,1e-08,1e-08,1e-06]
     43field_values=[\
     44        md.results['TransientSolution'][1]['Vx'],\
     45        md.results['TransientSolution'][1]['Vy'],\
     46        md.results['TransientSolution'][1]['Vz'],\
     47        md.results['TransientSolution'][1]['Vel'],\
     48        md.results['TransientSolution'][1]['Pressure'],\
     49        md.results['TransientSolution'][1]['Bed'],\
     50        md.results['TransientSolution'][1]['Surface'],\
     51        md.results['TransientSolution'][1]['Thickness'],\
     52        md.results['TransientSolution'][1]['Temperature'],\
     53        md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\
     54        md.results['TransientSolution'][2]['Vx'],\
     55        md.results['TransientSolution'][2]['Vy'],\
     56        md.results['TransientSolution'][2]['Vz'],\
     57        md.results['TransientSolution'][2]['Vel'],\
     58        md.results['TransientSolution'][2]['Pressure'],\
     59        md.results['TransientSolution'][2]['Bed'],\
     60        md.results['TransientSolution'][2]['Surface'],\
     61        md.results['TransientSolution'][2]['Thickness'],\
     62        md.results['TransientSolution'][2]['Temperature'],\
     63        md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\
     64        md.results['TransientSolution'][3]['Vx'],\
     65        md.results['TransientSolution'][3]['Vy'],\
     66        md.results['TransientSolution'][3]['Vz'],\
     67        md.results['TransientSolution'][3]['Vel'],\
     68        md.results['TransientSolution'][3]['Pressure'],\
     69        md.results['TransientSolution'][3]['Bed'],\
     70        md.results['TransientSolution'][3]['Surface'],\
     71        md.results['TransientSolution'][3]['Thickness'],\
     72        md.results['TransientSolution'][3]['Temperature'],\
     73        md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\
     74        ]

  • ../trunk-jpl/test/NightlyRun/test208.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test208.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',150000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md=setflowequation(md,'macayeal','all')
     27md.cluster=generic('name',oshostname(),'np',3)
     28md=solve(md,TransientSolutionEnum())
     29
     30
     31# Fields and tolerances to track changes
     32
     33field_names     =['Vx1','Vy1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Vx2','Vy2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Vx3','Vy3','Vel3','Pressure3','Bed3','Surface3','Thickness3']
     34field_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]
     35field_values=[\
     36        md.results['TransientSolution'][1]['Vx'],\
     37        md.results['TransientSolution'][1]['Vy'],\
     38        md.results['TransientSolution'][1]['Vel'],\
     39        md.results['TransientSolution'][1]['Pressure'],\
     40        md.results['TransientSolution'][1]['Bed'],\
     41        md.results['TransientSolution'][1]['Surface'],\
     42        md.results['TransientSolution'][1]['Thickness'],\
     43        md.results['TransientSolution'][2]['Vx'],\
     44        md.results['TransientSolution'][2]['Vy'],\
     45        md.results['TransientSolution'][2]['Vel'],\
     46        md.results['TransientSolution'][2]['Pressure'],\
     47        md.results['TransientSolution'][2]['Bed'],\
     48        md.results['TransientSolution'][2]['Surface'],\
     49        md.results['TransientSolution'][2]['Thickness'],\
     50        md.results['TransientSolution'][3]['Vx'],\
     51        md.results['TransientSolution'][3]['Vy'],\
     52        md.results['TransientSolution'][3]['Vel'],\
     53        md.results['TransientSolution'][3]['Pressure'],\
     54        md.results['TransientSolution'][3]['Bed'],\
     55        md.results['TransientSolution'][3]['Surface'],\
     56        md.results['TransientSolution'][3]['Thickness'],\
     57        ]

  • ../trunk-jpl/test/NightlyRun/test203.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test203.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,2)
     27md=setflowequation(md,'pattyn','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md=solve(md,DiagnosticSolutionEnum())
     30
     31
     32# Fields and tolerances to track changes
     33
     34field_names     =['Vx','Vy','Vz','Vel','Pressure']
     35field_tolerances=[1e-09,1e-09,1e-09,1e-09,1e-09]
     36field_values=[\
     37        md.results['DiagnosticSolution'][1]['Vx'],\
     38        md.results['DiagnosticSolution'][1]['Vy'],\
     39        md.results['DiagnosticSolution'][1]['Vz'],\
     40        md.results['DiagnosticSolution'][1]['Vel'],\
     41        md.results['DiagnosticSolution'][1]['Pressure'],\
     42        ]

  • ../trunk-jpl/test/NightlyRun/test206.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test206.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,1)
     27md=setflowequation(md,'macayeal','all')
     28md.timestepping.time_step=0
     29md.cluster=generic('name',oshostname(),'np',3)
     30md=solve(md,ThermalSolutionEnum())
     31
     32
     33# Fields and tolerances to track changes
     34
     35field_names     =['Temperature','BasalforcingsMeltingRate']
     36field_tolerances=[1e-13,1e-13]
     37field_values=[\
     38        md.results['ThermalSolution'][1]['Temperature'],\
     39        md.results['ThermalSolution'][1]['BasalforcingsMeltingRate'],\
     40        ]

  • ../trunk-jpl/test/NightlyRun/test209.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test209.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,1)
     27md=setflowequation(md,'macayeal','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md=solve(md,TransientSolutionEnum())
     30
     31
     32# Fields and tolerances to track changes
     33
     34field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
     35                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
     36                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     37field_tolerances=[\
     38        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\
     39        1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-13,1e-8,\
     40        1e-13,1e-13,1e-08,1e-13,1e-13,1e-10,1e-10,1e-10,1e-13,1e-8]
     41field_values=[\
     42        md.results['TransientSolution'][1]['Vx'],\
     43        md.results['TransientSolution'][1]['Vy'],\
     44        md.results['TransientSolution'][1]['Vz'],\
     45        md.results['TransientSolution'][1]['Vel'],\
     46        md.results['TransientSolution'][1]['Pressure'],\
     47        md.results['TransientSolution'][1]['Bed'],\
     48        md.results['TransientSolution'][1]['Surface'],\
     49        md.results['TransientSolution'][1]['Thickness'],\
     50        md.results['TransientSolution'][1]['Temperature'],\
     51        md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\
     52        md.results['TransientSolution'][2]['Vx'],\
     53        md.results['TransientSolution'][2]['Vy'],\
     54        md.results['TransientSolution'][2]['Vz'],\
     55        md.results['TransientSolution'][2]['Vel'],\
     56        md.results['TransientSolution'][2]['Pressure'],\
     57        md.results['TransientSolution'][2]['Bed'],\
     58        md.results['TransientSolution'][2]['Surface'],\
     59        md.results['TransientSolution'][2]['Thickness'],\
     60        md.results['TransientSolution'][2]['Temperature'],\
     61        md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\
     62        md.results['TransientSolution'][3]['Vx'],\
     63        md.results['TransientSolution'][3]['Vy'],\
     64        md.results['TransientSolution'][3]['Vz'],\
     65        md.results['TransientSolution'][3]['Vel'],\
     66        md.results['TransientSolution'][3]['Pressure'],\
     67        md.results['TransientSolution'][3]['Bed'],\
     68        md.results['TransientSolution'][3]['Surface'],\
     69        md.results['TransientSolution'][3]['Thickness'],\
     70        md.results['TransientSolution'][3]['Temperature'],\
     71        md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\
     72        ]

  • ../trunk-jpl/test/NightlyRun/test210.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test210.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',200000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,1)
     27md=setflowequation(md,'pattyn','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md=solve(md,TransientSolutionEnum())
     30
     31
     32# Fields and tolerances to track changes
     33
     34field_names     =['Vx1','Vy1','Vz1','Vel1','Pressure1','Bed1','Surface1','Thickness1','Temperature1','BasalforcingsMeltingRate1', \
     35                                      'Vx2','Vy2','Vz2','Vel2','Pressure2','Bed2','Surface2','Thickness2','Temperature2','BasalforcingsMeltingRate2', \
     36                                           'Vx3','Vy3','Vz3','Vel3','Pressure3','Bed3','Surface3','Thickness3','Temperature3','BasalforcingsMeltingRate3']
     37field_tolerances=[\
     38        1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,\
     39        1e-09,1e-09,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-09,1e-06,\
     40        1e-09,1e-09,1e-08,1e-08,1e-09,1e-09,1e-09,1e-09,1e-09,1e-05]
     41field_values=[\
     42        md.results['TransientSolution'][1]['Vx'],\
     43        md.results['TransientSolution'][1]['Vy'],\
     44        md.results['TransientSolution'][1]['Vz'],\
     45        md.results['TransientSolution'][1]['Vel'],\
     46        md.results['TransientSolution'][1]['Pressure'],\
     47        md.results['TransientSolution'][1]['Bed'],\
     48        md.results['TransientSolution'][1]['Surface'],\
     49        md.results['TransientSolution'][1]['Thickness'],\
     50        md.results['TransientSolution'][1]['Temperature'],\
     51        md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\
     52        md.results['TransientSolution'][2]['Vx'],\
     53        md.results['TransientSolution'][2]['Vy'],\
     54        md.results['TransientSolution'][2]['Vz'],\
     55        md.results['TransientSolution'][2]['Vel'],\
     56        md.results['TransientSolution'][2]['Pressure'],\
     57        md.results['TransientSolution'][2]['Bed'],\
     58        md.results['TransientSolution'][2]['Surface'],\
     59        md.results['TransientSolution'][2]['Thickness'],\
     60        md.results['TransientSolution'][2]['Temperature'],\
     61        md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\
     62        md.results['TransientSolution'][3]['Vx'],\
     63        md.results['TransientSolution'][3]['Vy'],\
     64        md.results['TransientSolution'][3]['Vz'],\
     65        md.results['TransientSolution'][3]['Vel'],\
     66        md.results['TransientSolution'][3]['Pressure'],\
     67        md.results['TransientSolution'][3]['Bed'],\
     68        md.results['TransientSolution'][3]['Surface'],\
     69        md.results['TransientSolution'][3]['Thickness'],\
     70        md.results['TransientSolution'][3]['Temperature'],\
     71        md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\
     72        ]

  • ../trunk-jpl/test/NightlyRun/test204.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test204.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,2)
     27md=setflowequation(md,'stokes','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md=solve(md,DiagnosticSolutionEnum())
     30
     31
     32# Fields and tolerances to track changes
     33
     34field_names     =['Vx','Vy','Vz','Vel','Pressure']
     35field_tolerances=[1e-08,1e-08,1e-07,1e-08,1e-08]
     36field_values=[\
     37        md.results['DiagnosticSolution'][1]['Vx'],\
     38        md.results['DiagnosticSolution'][1]['Vy'],\
     39        md.results['DiagnosticSolution'][1]['Vz'],\
     40        md.results['DiagnosticSolution'][1]['Vel'],\
     41        md.results['DiagnosticSolution'][1]['Pressure'],\
     42        ]

  • ../trunk-jpl/test/NightlyRun/test207.py

     
     1"""
     2== == == == == == == == == == == == == == == == == == ==
     3Auto generated python script for ISSM:   test207.m
     4Created on 2012-09-27 via translateToPy.py Ver 1.0 by mikep
     5== == == == == == == == == == == == == == == == == == ==
     6
     7Matlab script conversion into python
     8translateToPy.py Author: Michael Pellegrin
     9translateToPy.py Date: 09/24/12
     10== == == == == == == == == == == == == == == == == == ==
     11"""
     12
     13from MatlabFuncs import *
     14from model import *
     15from EnumDefinitions import *
     16from numpy import *
     17from triangle import *
     18from setmask import *
     19from parameterize import *
     20from setflowequation import *
     21from solve import *
     22
     23md=triangle(model(),'../Exp/Square.exp',180000)
     24md=setmask(md,'all','')
     25md=parameterize(md,'../Par/SquareShelf.py')
     26md.extrude(3,1)
     27md=setflowequation(md,'macayeal','all')
     28md.cluster=generic('name',oshostname(),'np',3)
     29md.transient.isdiagnostic=0
     30md.transient.isprognostic=0
     31md.transient.isthermal=1
     32md.transient.isgroundingline=0
     33md=solve(md,TransientSolutionEnum())
     34
     35
     36# Fields and tolerances to track changes
     37
     38field_names     =['Temperature1','BasalforcingsMeltingRate1','Temperature2','BasalforcingsMeltingRate2','Temperature3','BasalforcingsMeltingRate3']
     39field_tolerances=[1e-13,1e-13,1e-13,1e-13,1e-13,1e-13]
     40field_values=[\
     41        md.results['TransientSolution'][1]['Temperature'],\
     42        md.results['TransientSolution'][1]['BasalforcingsMeltingRate'],\
     43        md.results['TransientSolution'][2]['Temperature'],\
     44        md.results['TransientSolution'][2]['BasalforcingsMeltingRate'],\
     45        md.results['TransientSolution'][3]['Temperature'],\
     46        md.results['TransientSolution'][3]['BasalforcingsMeltingRate'],\
     47        ]

  • ../trunk-jpl/scripts/translateToPy.py

     
    6666                res = res.replace('thickness(pos)','thickness[pos]')
    6767                res = res.replace('find(md.','numpy.nonzero(md.')
    6868
     69                res = res.replace('\n','')
     70
     71                # handle inline comments
     72                res = res.replace('%','#')
     73
    6974                res = res.replace('...','\\')
     75
     76                # determine if the m file has mult. line cmd (real quick solution)
     77                multCmds = res.split(';')
     78                numLines = len( multCmds ) - 2
     79                allParts = ''
     80                for part in multCmds:
     81                        allParts += part
     82                        #allParts += re.sub('^\s+','',part)
     83                        #allParts += part.strip()
     84                        if numLines > 0:
     85                                allParts += '\n'
     86                                numLines -= 1
     87                res = allParts 
     88
    7089                res = res.replace(';','')
    71                 res = res.replace('\n','')
    7290
     91
    7392                res = convertFieldValues( res )
    74 
     93                #print 'resulting line:' + str(res) + '\n'
    7594                output(res)
    7695
    7796def convertFieldValues ( currentLine ):
    … …  
    103122                        res = res.replace('Solution.StressTensorxz)','Solution\'][1][\'StressTensorxz\']')
    104123                        res = res.replace('Solution.StressTensoryz)','Solution\'][1][\'StressTensoryz\']')
    105124
     125                        res = res.replace('Solution.FrictionCoefficient)','Solution\'][1][\'FrictionCoefficient\']')
     126                        res = res.replace('Solution.SurfaceforcingsMasBalance)','Solution\'][1][\'SurfaceforcingsMasBalance\']')
     127                        res = res.replace('Solution.MaskElementonfloatingice)','Solution\'][1][\'MaskElementonfloatingice\']')
     128                        res = res.replace('Solution.J)','Solution\'][1][\'J\']')
     129                        res = res.replace('Solution.BalancethicknessThickeningRate)','Solution\'][1][\'BalancethicknessThickeningRate\']')
     130
     131                        res = res.replace('Solution.Gradient1)','Solution\'][1][\'Gradient1\']')
     132                        res = res.replace('Solution.Gradient2)','Solution\'][1][\'Gradient2\']')
     133
     134                        res = res.replace('Solution.MaterialsRheologyZbar)','Solution\'][1][\'MaterialsRheologyZbar\']')
     135                        res = res.replace('Solution.MaterialsRheologyBbar)','Solution\'][1][\'MaterialsRheologyBbar\']')
     136                        res = res.replace('Solution.MaterialsRheologyB)','Solution\'][1][\'MaterialsRheologyB\']')
     137
    106138                        res = res.replace('Solution.Thickness)','Solution\'][1][\'Thickness\']')
    107139
    108140                        res = res.replace('Solution.Temperature)','Solution\'][1][\'Temperature\']')
    … …  
    120152                        res = res.replace('Solution.Enthalpy)','Solution\'][1][\'Enthalpy\']')
    121153                        res = res.replace('Solution.Waterfraction)','Solution\'][1][\'Waterfraction\']')
    122154                        res = res.replace('Solution.Temperature)','Solution\'][1][\'Temperature\']')
     155
     156                        # special case
     157                        res = res.replace('.DiagnosticSolution.J','[\'DiagnosticSolution\'][1][\'J\']')
     158
    123159        return res
    124160
    125161def output ( line ):
Note: See TracBrowser for help on using the repository browser.