/[escript]/trunk/downunder/py_src/splitinversioncostfunctions.py
ViewVC logotype

Diff of /trunk/downunder/py_src/splitinversioncostfunctions.py

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

revision 5653 by jfenwick, Sat Jun 13 04:36:22 2015 UTC revision 5654 by jfenwick, Mon Jun 15 05:21:00 2015 UTC
# Line 108  class SplitInversionCostFunction(Metered Line 108  class SplitInversionCostFunction(Metered
108          addVariable(splitworld,"mu_model", makeLocalOnly)          addVariable(splitworld,"mu_model", makeLocalOnly)
109    
110          addVariable(splitworld, "phi_a", makeScalarReducer, "SUM")          addVariable(splitworld, "phi_a", makeScalarReducer, "SUM")
111          addVariable(splitworld,"Jx_0", makeScalarReducer,"SUM")          addVariable(splitworld,"Jx_original", makeScalarReducer,"SET")
112          addVariable(splitworld, "Jx", makeScalarReducer, "SUM")          addVariable(splitworld, "Jx", makeScalarReducer, "SUM")
113            addVariable(splitworld, "Jx_old", makeScalarReducer,"SET")
114          addVariable(splitworld, "g_Jx_0", makeDataReducer, "SUM")          addVariable(splitworld, "g_Jx_0", makeDataReducer, "SUM")
115          addVariable(splitworld, "g_Jx_1", makeLocalOnly)        # This component is not merged with values from other worlds          addVariable(splitworld, "g_Jx_1", makeLocalOnly)        # This component is not merged with values from other worlds
116    
117            addVariable(splitworld, "old_g_Jx_0", makeDataReducer, "SUM")
118            addVariable(splitworld, "old_g_Jx_1", makeLocalOnly)        # This component is not merged with values from other worlds
119            
120            
121          addVariable(splitworld, "search_direction", makeDataReducer, "SET")          addVariable(splitworld, "search_direction", makeDataReducer, "SET")
122    
123          addVariable(splitworld, "s_and_y", makeLocalOnly)          addVariable(splitworld, "s_and_y", makeLocalOnly)
# Line 120  class SplitInversionCostFunction(Metered Line 126  class SplitInversionCostFunction(Metered
126          addVariable(splitworld, "phi0", makeLocalOnly)          addVariable(splitworld, "phi0", makeLocalOnly)
127          addVariable(splitworld, "base_point", makeLocalOnly)          addVariable(splitworld, "base_point", makeLocalOnly)
128                    
129            addVariable(splitworld, "conv_flag", makeLocalOnly)
130            
131          howmany=splitworld.getSubWorldCount()          howmany=splitworld.getSubWorldCount()
132          rlen=int(math.ceil(numModels/howmany))          rlen=int(math.ceil(numModels/howmany))
133          rstart=rlen*splitworld.getSubWorldID()          rstart=rlen*splitworld.getSubWorldID()

Legend:
Removed from v.5653  
changed lines
  Added in v.5654

  ViewVC Help
Powered by ViewVC 1.1.26