Changeset 13491

Timestamp:

09/30/12 20:21:22 (12 years ago)

Author:

mikep

Message:

Checkin last py scripts I was able to test successfully.

Location:

issm/trunk-jpl

Files:

• scripts/translateToPy.py (modified) (3 diffs)
• test/NightlyRun/test202.py (added)
• test/NightlyRun/test203.py (added)
• test/NightlyRun/test204.py (added)
• test/NightlyRun/test206.py (added)
• test/NightlyRun/test207.py (added)
• test/NightlyRun/test208.py (added)
• test/NightlyRun/test209.py (added)
• test/NightlyRun/test210.py (added)
• test/NightlyRun/test211.py (added)

issm/trunk-jpl/scripts/translateToPy.py ¶

@@ -67 +67 @@
                 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)
 
@@ -104 +123 @@
                         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\']')
 
@@ -121 +153 @@
                         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