Home My Page Projects Code Snippets Project Openings diderot
Summary Activity Tracker Tasks SCM

SCM Repository

[diderot] Diff of /branches/ein16/synth/d2/test_createField.py
ViewVC logotype

Diff of /branches/ein16/synth/d2/test_createField.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4256, Mon Jul 25 14:49:22 2016 UTC revision 4257, Mon Jul 25 15:23:32 2016 UTC
# Line 143  Line 143 
143                  return COEFF + SIZE                  return COEFF + SIZE
144              elif(fty.isEq_id(itype,  ty_mat2x2F_d2)):              elif(fty.isEq_id(itype,  ty_mat2x2F_d2)):
145                  [m0,m1]=coeff                  [m0,m1]=coeff
146                  [v1,v3] = m0                  #[v1,v3] = m0
147                  [v2,v4] = m1                  #[v2,v4] = m1
148                    [v1,v2] = m0
149                    [v3,v4] = m1
150                  COEFF = coeffToBase(v1, "1")+coeffToBase(v2, "2")+coeffToBase(v3, "3")+coeffToBase(v4, "4")#convert coeff to strings                  COEFF = coeffToBase(v1, "1")+coeffToBase(v2, "2")+coeffToBase(v3, "3")+coeffToBase(v4, "4")#convert coeff to strings
151                  SIZE=" -sz0 "+ sout +" -sz1 "+ sout +" -width 1"    # giving sample size                  SIZE=" -sz0 "+ sout +" -sz1 "+ sout +" -width 1"    # giving sample size
152                  return COEFF + SIZE                  return COEFF + SIZE
# Line 174  Line 176 
176                  return COEFF + SIZE                  return COEFF + SIZE
177              elif(fty.isEq_id(itype, ty_mat2x2F_d3)):              elif(fty.isEq_id(itype, ty_mat2x2F_d3)):
178                  [m0, m1] = coeff                  [m0, m1] = coeff
179                  [[az0, az1, az2], [cz0, cz1, cz2]] = m0                  #[[az0, az1, az2], [cz0, cz1, cz2]] = m0
180                  [[bz0, bz1, bz2], [dz0, dz1, dz2]] = m1                  #[[bz0, bz1, bz2], [dz0, dz1, dz2]] = m1
181                    [[az0, az1, az2], [bz0, bz1, bz2]] = m0
182                    [[cz0, cz1, cz2], [dz0, dz1, dz2]] = m1
183                  COEFF= coeffToBase(az0, "1_z0")+coeffToBase(az1, "1_z1")+coeffToBase(az2, "1_z2")                  COEFF= coeffToBase(az0, "1_z0")+coeffToBase(az1, "1_z1")+coeffToBase(az2, "1_z2")
184                  COEFF+=coeffToBase(bz0, "2_z0")+coeffToBase(bz1, "2_z1")+coeffToBase(bz2, "2_z2")                  COEFF+=coeffToBase(bz0, "2_z0")+coeffToBase(bz1, "2_z1")+coeffToBase(bz2, "2_z2")
185                  COEFF+=coeffToBase(cz0, "3_z0")+coeffToBase(cz1, "3_z1")+coeffToBase(cz2, "3_z2")                  COEFF+=coeffToBase(cz0, "3_z0")+coeffToBase(cz1, "3_z1")+coeffToBase(cz2, "3_z2")

Legend:
Removed from v.4256  
changed lines
  Added in v.4257

root@smlnj-gforge.cs.uchicago.edu
ViewVC Help
Powered by ViewVC 1.0.0