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

SCM Repository

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

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

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

revision 4482, Thu Sep 1 20:43:01 2016 UTC revision 4483, Fri Sep 2 05:07:01 2016 UTC
# Line 251  Line 251 
251    
252  #tensors  #tensors
253  id=0  id=0
254  [ty_scalarT, ty_vec2T, ty_vec3T, ty_vec4T] =  mkVecT(id)  tvs = mkVecT(id)
255  [ty_mat2x2T, ty_mat2x3T,ty_mat2x4T,ty_mat3x2T,ty_mat3x3T,ty_mat3x4T,ty_mat4x2T,ty_mat4x3T,ty_mat4x4T] = mkMatT(id)  tms = mkMatT(id)
256  [ty_ten2x2x2T, ty_ten2x2x3T,ty_ten2x2x4T, ty_ten2x3x2T,ty_ten2x3x3T, ty_ten2x3x4T,ty_ten2x4x2T,ty_ten2x4x3T,ty_ten2x4x4T] = mkTen2T(id)  tt2 = mkTen2T(id)
257  [ty_ten3x2x2T, ty_ten3x2x3T,ty_ten3x2x4T, ty_ten3x3x2T,ty_ten3x3x3T, ty_ten3x3x4T,ty_ten3x4x2T,ty_ten3x4x3T,ty_ten3x4x4T] = mkTen3T(id)  tt3 = mkTen3T(id)
258  [ty_ten4x2x2T, ty_ten4x2x3T,ty_ten4x2x4T, ty_ten4x3x2T,ty_ten4x3x3T, ty_ten4x3x4T,ty_ten4x4x2T,ty_ten4x4x3T,ty_ten4x4x4T] = mkTen4T(id)  tt4 = mkTen4T(id)
259    
260    [ty_scalarT, ty_vec2T, ty_vec3T, ty_vec4T] = tvs
261    [ty_mat2x2T, ty_mat2x3T,ty_mat2x4T,ty_mat3x2T,ty_mat3x3T,ty_mat3x4T,ty_mat4x2T,ty_mat4x3T,ty_mat4x4T] = tms
262    [ty_ten2x2x2T, ty_ten2x2x3T,ty_ten2x2x4T, ty_ten2x3x2T,ty_ten2x3x3T, ty_ten2x3x4T,ty_ten2x4x2T,ty_ten2x4x3T,ty_ten2x4x4T] = tt2
263    [ty_ten3x2x2T, ty_ten3x2x3T,ty_ten3x2x4T, ty_ten3x3x2T,ty_ten3x3x3T, ty_ten3x3x4T,ty_ten3x4x2T,ty_ten3x4x3T,ty_ten3x4x4T] =tt3
264    [ty_ten4x2x2T, ty_ten4x2x3T,ty_ten4x2x4T, ty_ten4x3x2T,ty_ten4x3x3T, ty_ten4x3x4T,ty_ten4x4x2T,ty_ten4x4x3T,ty_ten4x4x4T] =tt4
265    
266    
267  # define possible tensor types  # define possible tensor types
# Line 336  Line 342 
342  #dimension 1  #dimension 1
343  id = 100  id = 100
344  dim = 1  dim = 1
345  [ty_scalarF_d1, ty_vec2F_d1, ty_vec3F_d1, ty_vec4F_d1] =  mkVecF(mkField, id, dim)  vecd1 =  mkVecF(mkField, id, dim)
346  [ty_mat2x2F_d1, ty_mat2x3F_d1,ty_mat2x4F_d1,ty_mat3x2F_d1,ty_mat3x3F_d1,ty_mat3x4F_d1,ty_mat4x2F_d1,ty_mat4x3F_d1,ty_mat4x4F_d1] = mkMatF( mkField, id, dim)  matd1 = mkMatF( mkField, id, dim)
347  [ty_ten2x2x2F_d1,  ty_ten2x2x3F_d1, ty_ten2x2x4F_d1,  ty_ten2x3x2F_d1, ty_ten2x3x3F_d1,  ty_ten2x3x4F_d1, ty_ten2x4x2F_d1, ty_ten2x4x3F_d1, ty_ten2x4x4F_d1] = mkTen2F(mkField, id, dim)  ten2d1 = mkTen2F(mkField, id, dim)
348  [ty_ten3x2x2F_d1,  ty_ten3x2x3F_d1, ty_ten3x2x4F_d1,  ty_ten3x3x2F_d1, ty_ten3x3x3F_d1,  ty_ten3x3x4F_d1, ty_ten3x4x2F_d1, ty_ten3x4x3F_d1, ty_ten3x4x4F_d1] = mkTen3F(mkField, id, dim)  ten3d1 = mkTen3F(mkField, id, dim)
349  [ty_ten4x2x2F_d1,  ty_ten4x2x3F_d1, ty_ten4x2x4F_d1,  ty_ten4x3x2F_d1, ty_ten4x3x3F_d1,  ty_ten4x3x4F_d1, ty_ten4x4x2F_d1, ty_ten4x4x3F_d1, ty_ten4x4x4F_d1] = mkTen4F(mkField, id, dim)  ten4d1 = mkTen4F(mkField, id, dim)
350    fld1= vecd1+matd1+ten2d1+ten3d1+ten4d1
351    [ty_scalarF_d1, ty_vec2F_d1, ty_vec3F_d1, ty_vec4F_d1] =  vecd1
352    [ty_mat2x2F_d1, ty_mat2x3F_d1,ty_mat2x4F_d1,ty_mat3x2F_d1,ty_mat3x3F_d1,ty_mat3x4F_d1,ty_mat4x2F_d1,ty_mat4x3F_d1,ty_mat4x4F_d1] = matd1
353    [ty_ten2x2x2F_d1,  ty_ten2x2x3F_d1, ty_ten2x2x4F_d1,  ty_ten2x3x2F_d1, ty_ten2x3x3F_d1,  ty_ten2x3x4F_d1, ty_ten2x4x2F_d1, ty_ten2x4x3F_d1, ty_ten2x4x4F_d1] = ten2d1
354    [ty_ten3x2x2F_d1,  ty_ten3x2x3F_d1, ty_ten3x2x4F_d1,  ty_ten3x3x2F_d1, ty_ten3x3x3F_d1,  ty_ten3x3x4F_d1, ty_ten3x4x2F_d1, ty_ten3x4x3F_d1, ty_ten3x4x4F_d1] = ten3d1
355    [ty_ten4x2x2F_d1,  ty_ten4x2x3F_d1, ty_ten4x2x4F_d1,  ty_ten4x3x2F_d1, ty_ten4x3x3F_d1,  ty_ten4x3x4F_d1, ty_ten4x4x2F_d1, ty_ten4x4x3F_d1, ty_ten4x4x4F_d1] = ten4d1
356    
357    
358  #dimension 2  #dimension 2
359  id = 200  id = 200
360  dim = 2  dim = 2
361  [ty_scalarF_d2, ty_vec2F_d2, ty_vec3F_d2, ty_vec4F_d2] =  mkVecF(mkField, id, dim)  vecd2 =  mkVecF(mkField, id, dim)
362  [ty_mat2x2F_d2, ty_mat2x3F_d2,ty_mat2x4F_d2,ty_mat3x2F_d2,ty_mat3x3F_d2,ty_mat3x4F_d2,ty_mat4x2F_d2,ty_mat4x3F_d2,ty_mat4x4F_d2] = mkMatF( mkField, id, dim)  matd2 = mkMatF( mkField, id, dim)
363  [ty_ten2x2x2F_d2,  ty_ten2x2x3F_d2, ty_ten2x2x4F_d2,  ty_ten2x3x2F_d2, ty_ten2x3x3F_d2,  ty_ten2x3x4F_d2, ty_ten2x4x2F_d2, ty_ten2x4x3F_d2, ty_ten2x4x4F_d2] = mkTen2F(mkField, id, dim)  ten2d2 = mkTen2F(mkField, id, dim)
364  [ty_ten3x2x2F_d2,  ty_ten3x2x3F_d2, ty_ten3x2x4F_d2,  ty_ten3x3x2F_d2, ty_ten3x3x3F_d2,  ty_ten3x3x4F_d2, ty_ten3x4x2F_d2, ty_ten3x4x3F_d2, ty_ten3x4x4F_d2] = mkTen3F(mkField, id, dim)  ten3d2 = mkTen3F(mkField, id, dim)
365  [ty_ten4x2x2F_d2,  ty_ten4x2x3F_d2, ty_ten4x2x4F_d2,  ty_ten4x3x2F_d2, ty_ten4x3x3F_d2,  ty_ten4x3x4F_d2, ty_ten4x4x2F_d2, ty_ten4x4x3F_d2, ty_ten4x4x4F_d2] = mkTen4F(mkField, id, dim)  ten4d2 = mkTen4F(mkField, id, dim)
366    [ty_scalarF_d2, ty_vec2F_d2, ty_vec3F_d2, ty_vec4F_d2] = vecd2
367    [ty_mat2x2F_d2, ty_mat2x3F_d2,ty_mat2x4F_d2,ty_mat3x2F_d2,ty_mat3x3F_d2,ty_mat3x4F_d2,ty_mat4x2F_d2,ty_mat4x3F_d2,ty_mat4x4F_d2] = matd2
368    [ty_ten2x2x2F_d2,  ty_ten2x2x3F_d2, ty_ten2x2x4F_d2,  ty_ten2x3x2F_d2, ty_ten2x3x3F_d2,  ty_ten2x3x4F_d2, ty_ten2x4x2F_d2, ty_ten2x4x3F_d2, ty_ten2x4x4F_d2] = ten2d2
369    [ty_ten3x2x2F_d2,  ty_ten3x2x3F_d2, ty_ten3x2x4F_d2,  ty_ten3x3x2F_d2, ty_ten3x3x3F_d2,  ty_ten3x3x4F_d2, ty_ten3x4x2F_d2, ty_ten3x4x3F_d2, ty_ten3x4x4F_d2] = ten3d2
370    [ty_ten4x2x2F_d2,  ty_ten4x2x3F_d2, ty_ten4x2x4F_d2,  ty_ten4x3x2F_d2, ty_ten4x3x3F_d2,  ty_ten4x3x4F_d2, ty_ten4x4x2F_d2, ty_ten4x4x3F_d2, ty_ten4x4x4F_d2] = ten4d2
371    fld2= vecd2+matd2+ten2d2+ten3d2+ten4d2
372    
373  #dimension 3  #dimension 3
374  id = 300  id = 300

Legend:
Removed from v.4482  
changed lines
  Added in v.4483

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