From: Justin M. <jc...@us...> - 2005-06-30 21:48:34
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Thursday June 30, 2005 @ 14:48 Author: jc...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13631 Modified Files: FieldMFAugLagMultT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/FieldMFAugLagMultT.cpp> Log Message: FieldMFAugLagMult.cpp includes hard coded manufactured solution to be imposed by augmented lagrangian -JCM =================================================================== File: no file FieldMFAugLagMultT.cpp Status: Needs Checkout Working revision: 1.2 Thu Jun 30 21:48:23 2005 Repository revision: 1.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/FieldMFAugLagMultT.cpp,v Existing Tags: BRANCH_david_4_merge (branch: 1.1.12) PRE_MERGE_branch_david_4 (revision: 1.1) BRANCH_david_4_premerge (branch: 1.1.10) BRANCH_Surf (branch: 1.1.8) BRANCH_Surface (branch: 1.1.6) END_david_spatial (revision: 1.1) BRANCH_david_spatial_2 (branch: 1.1.4) BRANCH_david_spatial (branch: 1.1.2) |
From: Justin M. <jc...@us...> - 2005-06-30 21:49:43
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Thursday June 30, 2005 @ 14:49 Author: jc...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15011 Modified Files: MFAugLagMultT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFAugLagMultT.cpp> Log Message: Changed "false" to "true" on l.238 in MFAugLagMultT.cpp -JCM =================================================================== File: no file MFAugLagMultT.cpp Status: Needs Checkout Working revision: 1.10 Thu Jun 30 21:49:36 2005 Repository revision: 1.10 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFAugLagMultT.cpp,v Existing Tags: END_BRANCH_david_4 (revision: 1.6) BRANCH_david_4_merge (branch: 1.9.12) PRE_MERGE_branch_david_4 (revision: 1.9) BRANCH_david_4_premerge (branch: 1.9.10) BRANCH_Surf (branch: 1.9.8) BRANCH_Surface (branch: 1.9.6) END_david_spatial (revision: 1.9) BRANCH_david_spatial_2 (branch: 1.9.4) BRANCH_david_spatial (branch: 1.9.2) BRANCH_david_4 (branch: 1.6.12) END_BRANCH_david_3 (revision: 1.6) PRE_MERGE_branch_david_3 (revision: 1.6) BRANCH_david_3_premerge (branch: 1.6.10) BRANCH_force_1 (branch: 1.6.8) BRANCH_david_3 (branch: 1.6.6) END_BRANCH_david_2 (revision: 1.4) PRE_MERGE_BRANCH_david_2 (revision: 1.6) BRANCH_david_2_merge (branch: 1.6.4) BRANCH_spatial_1 (branch: 1.6.2) BRANCH_david_2 (branch: 1.4.4) PRE_MERGE_david_1 (revision: 1.4) TAHOE_2_1 (revision: 1.4) BRANCH_david_1 (branch: 1.4.2) TAHOE_2_0 (revision: 1.4) TAHOE_1_X (branch: 1.3.4) TAHOE_1_4 (revision: 1.3) BRANCH_parameter_4 (branch: 1.3.2) PRE_MERGE_BRANCH_LJ3D (revision: 1.3) PRE_MERGE_penetration_2 (revision: 1.3) PRE_MERGE_bridging_6 (revision: 1.3) ROOT_BRANCH_NN (revision: 1.1) BRANCH_NN (branch: 1.1.2) |
From: Patrick K. <pa...@us...> - 2005-07-02 22:50:46
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Saturday July 2, 2005 @ 15:50 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28091/src/nodes/FBC_controllers Modified Files: Tag: BRANCH_david_spatial_2 AugLagCylinderT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagCylinderT.cpp> AugLagSphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagSphereT.cpp> AugLagWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.cpp> AugLagWallT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.h> FBC_ControllerT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h> MFPenaltySphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp> MFPenaltySphereT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.h> PenaltyCylinderT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyCylinderT.cpp> PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> PenaltyRegionT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h> PenaltySphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltySphereT.cpp> PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: added UpdateConfiguration method =================================================================== File: no file AugLagCylinderT.cpp Status: Needs Checkout Working revision: 1.5.14.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.5.14.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagCylinderT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.5.14) Existing Tags: END_BRANCH_david_4 (revision: 1.5) BRANCH_david_4_merge (branch: 1.5.22) PRE_MERGE_branch_david_4 (revision: 1.5) BRANCH_david_4_premerge (branch: 1.5.20) BRANCH_Surf (branch: 1.5.18) BRANCH_Surface (branch: 1.5.16) END_david_spatial (revision: 1.5) BRANCH_david_spatial_2 (branch: 1.5.14) BRANCH_david_spatial (branch: 1.5.12) BRANCH_david_4 (branch: 1.5.10) END_BRANCH_david_3 (revision: 1.5) PRE_MERGE_branch_david_3 (revision: 1.5) BRANCH_david_3_premerge (branch: 1.5.8) BRANCH_force_1 (branch: 1.5.6) BRANCH_david_3 (branch: 1.5.4) END_BRANCH_david_2 (revision: 1.2) PRE_MERGE_BRANCH_david_2 (revision: 1.5) BRANCH_david_2_merge (branch: 1.5.2) BRANCH_spatial_1 (branch: 1.3.2) BRANCH_david_2 (branch: 1.2.2) PRE_MERGE_david_1 (revision: 1.2) =================================================================== File: no file AugLagSphereT.cpp Status: Needs Checkout Working revision: 1.16.14.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.16.14.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagSphereT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.16.14) Existing Tags: END_BRANCH_david_4 (revision: 1.16) BRANCH_david_4_merge (branch: 1.16.22) PRE_MERGE_branch_david_4 (revision: 1.16) BRANCH_david_4_premerge (branch: 1.16.20) BRANCH_Surf (branch: 1.16.18) BRANCH_Surface (branch: 1.16.16) END_david_spatial (revision: 1.16) BRANCH_david_spatial_2 (branch: 1.16.14) BRANCH_david_spatial (branch: 1.16.12) BRANCH_david_4 (branch: 1.16.10) END_BRANCH_david_3 (revision: 1.16) PRE_MERGE_branch_david_3 (revision: 1.16) BRANCH_david_3_premerge (branch: 1.16.8) BRANCH_force_1 (branch: 1.16.6) BRANCH_david_3 (branch: 1.16.4) END_BRANCH_david_2 (revision: 1.14) PRE_MERGE_BRANCH_david_2 (revision: 1.16) BRANCH_david_2_merge (branch: 1.16.2) BRANCH_spatial_1 (branch: 1.14.4) BRANCH_david_2 (branch: 1.14.2) PRE_MERGE_david_1 (revision: 1.14) TAHOE_2_1 (revision: 1.12) BRANCH_david_1 (branch: 1.12.2) TAHOE_2_0 (revision: 1.12) TAHOE_1_X (branch: 1.11.38) TAHOE_1_4 (revision: 1.11) BRANCH_parameter_4 (branch: 1.11.36) END_BRANCH_LJ3D (revision: 1.11) PRE_MERGE_BRANCH_LJ3D (revision: 1.11) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.11) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.11) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.1) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.10) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.12) BRANCH_paklein_3 (branch: 1.10.8) BRANCH_THK_3 (branch: 1.10.10) ROOT_THK_3 (revision: 1.10) END_THK_2 (revision: 1.10) PRE_MERGE_THK_2 (revision: 1.10) TAHOE_1_2 (revision: 1.10) END_bridging_2 (revision: 1.10) PRE_MERGE_bridging_2 (revision: 1.10) BRANCH_THK_2 (branch: 1.10.6) ROOT_THK_2 (revision: 1.10) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.10) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.10) BRANCH_bridging_2 (branch: 1.10.4) ROOT_bridging_2 (revision: 1.10) BRANCH_parameter_1 (branch: 1.10.2) ROOT_parameter_1 (revision: 1.10) TAHOE_1_1_0 (revision: 1.10) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.1) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.2) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.3) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file AugLagWallT.cpp Status: Needs Checkout Working revision: 1.17.14.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.17.14.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.17.14) Existing Tags: END_BRANCH_david_4 (revision: 1.17) BRANCH_david_4_merge (branch: 1.17.22) PRE_MERGE_branch_david_4 (revision: 1.17) BRANCH_david_4_premerge (branch: 1.17.20) BRANCH_Surf (branch: 1.17.18) BRANCH_Surface (branch: 1.17.16) END_david_spatial (revision: 1.17) BRANCH_david_spatial_2 (branch: 1.17.14) BRANCH_david_spatial (branch: 1.17.12) BRANCH_david_4 (branch: 1.17.10) END_BRANCH_david_3 (revision: 1.17) PRE_MERGE_branch_david_3 (revision: 1.17) BRANCH_david_3_premerge (branch: 1.17.8) BRANCH_force_1 (branch: 1.17.6) BRANCH_david_3 (branch: 1.17.4) END_BRANCH_david_2 (revision: 1.15) PRE_MERGE_BRANCH_david_2 (revision: 1.17) BRANCH_david_2_merge (branch: 1.17.2) BRANCH_spatial_1 (branch: 1.16.2) BRANCH_david_2 (branch: 1.15.2) PRE_MERGE_david_1 (revision: 1.15) TAHOE_2_1 (revision: 1.12) BRANCH_david_1 (branch: 1.12.2) TAHOE_2_0 (revision: 1.12) TAHOE_1_X (branch: 1.11.38) TAHOE_1_4 (revision: 1.11) BRANCH_parameter_4 (branch: 1.11.36) END_BRANCH_LJ3D (revision: 1.11) PRE_MERGE_BRANCH_LJ3D (revision: 1.11) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.11) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.11) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.1) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.10) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.12) BRANCH_paklein_3 (branch: 1.10.8) BRANCH_THK_3 (branch: 1.10.10) ROOT_THK_3 (revision: 1.10) END_THK_2 (revision: 1.10) PRE_MERGE_THK_2 (revision: 1.10) TAHOE_1_2 (revision: 1.10) END_bridging_2 (revision: 1.10) PRE_MERGE_bridging_2 (revision: 1.10) BRANCH_THK_2 (branch: 1.10.6) ROOT_THK_2 (revision: 1.10) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.10) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.10) BRANCH_bridging_2 (branch: 1.10.4) ROOT_bridging_2 (revision: 1.10) BRANCH_parameter_1 (branch: 1.10.2) ROOT_parameter_1 (revision: 1.10) TAHOE_1_1_0 (revision: 1.10) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.1) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.2.2) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.2) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.1) T040102 (revision: 1.1) T031502 (revision: 1.1) T030102 (revision: 1.1) T021502 (revision: 1.1) T020102 (revision: 1.1) T011502 (revision: 1.1) T010102 (revision: 1.1) PRE_MERGE_model_1 (revision: 1.1) END_model_1 (revision: 1.1) T121501 (revision: 1.1) T120101 (revision: 1.1) T111501 (revision: 1.1) T110101 (revision: 1.1) T101501 (revision: 1.1) T100101 (revision: 1.1) BRANCH_model_1 (branch: 1.1.2) ROOT_model_1 (revision: 1.1) T091501 (revision: 1.1) =================================================================== File: no file AugLagWallT.h Status: Needs Checkout Working revision: 1.13.14.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.13.14.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.h,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.13.14) Existing Tags: END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.22) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.20) BRANCH_Surf (branch: 1.13.18) BRANCH_Surface (branch: 1.13.16) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.14) BRANCH_david_spatial (branch: 1.13.12) BRANCH_david_4 (branch: 1.13.10) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.8) BRANCH_force_1 (branch: 1.13.6) BRANCH_david_3 (branch: 1.13.4) END_BRANCH_david_2 (revision: 1.12) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.2) BRANCH_spatial_1 (branch: 1.12.4) BRANCH_david_2 (branch: 1.12.2) PRE_MERGE_david_1 (revision: 1.12) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.28) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.26) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.24) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.22) BRANCH_LJ3D (branch: 1.9.20) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.2.1) BRANCH_parameter_3 (branch: 1.9.18) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.16) BRANCH_jzimmer_1 (branch: 1.9.14) BRANCH_3DBS (branch: 1.9.12) BRANCH_penetration_1 (branch: 1.9.6) BRANCH_bridging_5 (branch: 1.9.10) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.8) BRANCH_BS3D (branch: 1.9.4) BRANCH_parameter_2 (branch: 1.9.2) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.7.8.1) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.8.10) END_bsun_2 (revision: 1.8) PRE_MERGE_bsun_2 (revision: 1.8) BRANCH_bsun_2 (branch: 1.8.8) ROOT_bsun_2 (revision: 1.8) END_bsun_1 (revision: 1.8) END_bridging_3 (revision: 1.8) PRE_MERGE_bridging_3 (revision: 1.8) BRANCH_bridging_3 (branch: 1.8.6) ROOT_bridging_3 (revision: 1.8) FRACTURE_INTERFACE_0_2 (branch: 1.8.4) BRANCH_bsun_1 (branch: 1.8.2) ROOT_bsun_1 (revision: 1.8) END_THK_3 (revision: 1.7) PRE_MERGE_THK_3 (revision: 1.7) BRANCH_cjkimme_1 (branch: 1.7.12) BRANCH_paklein_3 (branch: 1.7.8) BRANCH_THK_3 (branch: 1.7.10) ROOT_THK_3 (revision: 1.7) END_THK_2 (revision: 1.7) PRE_MERGE_THK_2 (revision: 1.7) TAHOE_1_2 (revision: 1.7) END_bridging_2 (revision: 1.7) PRE_MERGE_bridging_2 (revision: 1.7) BRANCH_THK_2 (branch: 1.7.6) ROOT_THK_2 (revision: 1.7) END_THK_1 (revision: 1.6) PRE_MERGE_THK_1 (revision: 1.7) END_bridging_1 (revision: 1.6) END_atom_1 (revision: 1.6) END_parameter_1 (revision: 1.7) BRANCH_bridging_2 (branch: 1.7.4) ROOT_bridging_2 (revision: 1.7) BRANCH_parameter_1 (branch: 1.7.2) ROOT_parameter_1 (revision: 1.7) TAHOE_1_1_0 (revision: 1.7) BRANCH_THK_1 (branch: 1.6.8) ROOT_THK_1 (revision: 1.6) PRE_MERGE_bridging_1 (revision: 1.6) BRANCH_conveyor_1 (branch: 1.6.6) TAHOE_1_0_1 (revision: 1.6) BRANCH_bridging_1 (branch: 1.6.4) ROOT_bridging_1 (revision: 1.6) TAHOE_1_0_0 (revision: 1.6) PRE_MERGE_atom_1 (revision: 1.6) T011503 (revision: 1.6) T010103 (revision: 1.6) T121502 (revision: 1.6) BRANCH_atom_1 (branch: 1.6.2) ROOT_atom_1 (revision: 1.6) T120102 (revision: 1.6) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.2.1) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.2) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.1) T040102 (revision: 1.1) T031502 (revision: 1.1) T030102 (revision: 1.1) T021502 (revision: 1.1) T020102 (revision: 1.1) T011502 (revision: 1.1) T010102 (revision: 1.1) PRE_MERGE_model_1 (revision: 1.1) END_model_1 (revision: 1.1) T121501 (revision: 1.1) T120101 (revision: 1.1) T111501 (revision: 1.1) T110101 (revision: 1.1) T101501 (revision: 1.1) T100101 (revision: 1.1) BRANCH_model_1 (branch: 1.1.2) ROOT_model_1 (revision: 1.1) T091501 (revision: 1.1) =================================================================== File: no file FBC_ControllerT.h Status: Needs Checkout Working revision: 1.17.4.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.17.4.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.17.4) Existing Tags: END_BRANCH_david_4 (revision: 1.16) BRANCH_david_4_merge (branch: 1.17.12) PRE_MERGE_branch_david_4 (revision: 1.17) BRANCH_david_4_premerge (branch: 1.17.10) BRANCH_Surf (branch: 1.17.8) BRANCH_Surface (branch: 1.17.6) END_david_spatial (revision: 1.17) BRANCH_david_spatial_2 (branch: 1.17.4) BRANCH_david_spatial (branch: 1.17.2) BRANCH_david_4 (branch: 1.16.14) END_BRANCH_david_3 (revision: 1.16) PRE_MERGE_branch_david_3 (revision: 1.16) BRANCH_david_3_premerge (branch: 1.16.12) BRANCH_force_1 (branch: 1.16.10) BRANCH_david_3 (branch: 1.16.8) END_BRANCH_david_2 (revision: 1.16) PRE_MERGE_BRANCH_david_2 (revision: 1.16) BRANCH_david_2_merge (branch: 1.16.6) BRANCH_spatial_1 (branch: 1.16.4) BRANCH_david_2 (branch: 1.16.2) PRE_MERGE_david_1 (revision: 1.16) TAHOE_2_1 (revision: 1.14) BRANCH_david_1 (branch: 1.14.2) TAHOE_2_0 (revision: 1.14) TAHOE_1_X (branch: 1.13.6) TAHOE_1_4 (revision: 1.13) BRANCH_parameter_4 (branch: 1.13.4) END_BRANCH_LJ3D (revision: 1.12) PRE_MERGE_BRANCH_LJ3D (revision: 1.13) END_penetration_2 (revision: 1.12) PRE_MERGE_penetration_2 (revision: 1.13) END_bridging_6 (revision: 1.12) PRE_MERGE_bridging_6 (revision: 1.13) ROOT_BRANCH_NN (revision: 1.13) BRANCH_NN (branch: 1.13.2) END_bridging_5 (revision: 1.12) BRANCH_bridging_6 (branch: 1.12.32) BRANCH_LJ3D (branch: 1.12.30) ROOT_BRANCH_LJ3D (revision: 1.12) END_BRANCH_3DBS (revision: 1.12) END_BRANCH_BS3D (revision: 1.12) PRE_MERGE_BRANCH_BS3D (revision: 1.12) END_parameter_2 (revision: 1.12.12.3) BRANCH_parameter_3 (branch: 1.12.28) END_jzimmer_1 (revision: 1.12) PRE_MERGE_jzimmer_1 (revision: 1.12) END_penetration_1 (revision: 1.12) BRANCH_penetration_2 (branch: 1.12.26) BRANCH_jzimmer_1 (branch: 1.12.24) BRANCH_3DBS (branch: 1.12.22) BRANCH_penetration_1 (branch: 1.12.16) BRANCH_bridging_5 (branch: 1.12.20) END_bridging_4 (revision: 1.12) BRANCH_bridging_4 (branch: 1.12.18) BRANCH_BS3D (branch: 1.12.14) BRANCH_parameter_2 (branch: 1.12.12) ROOT_parameter_2 (revision: 1.12) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.12) BRANCH_solve_1 (branch: 1.12.10) END_bsun_2 (revision: 1.12) PRE_MERGE_bsun_2 (revision: 1.12) BRANCH_bsun_2 (branch: 1.12.8) ROOT_bsun_2 (revision: 1.12) END_bsun_1 (revision: 1.12) END_bridging_3 (revision: 1.12) PRE_MERGE_bridging_3 (revision: 1.12) BRANCH_bridging_3 (branch: 1.12.6) ROOT_bridging_3 (revision: 1.12) FRACTURE_INTERFACE_0_2 (branch: 1.12.4) BRANCH_bsun_1 (branch: 1.12.2) ROOT_bsun_1 (revision: 1.12) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.11) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.10) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.6) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.8) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.8) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.4) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.2) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.8.6) ROOT_THK_1 (revision: 1.8) PRE_MERGE_bridging_1 (revision: 1.8) BRANCH_conveyor_1 (branch: 1.8.4) TAHOE_1_0_1 (revision: 1.8) BRANCH_bridging_1 (branch: 1.8.2) ROOT_bridging_1 (revision: 1.8) TAHOE_1_0_0 (revision: 1.8) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5.8.1) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.4.3) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.4) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.2) T040102 (revision: 1.2) T031502 (revision: 1.2) T030102 (revision: 1.2) T021502 (revision: 1.2) T020102 (revision: 1.2) T011502 (revision: 1.2) T010102 (revision: 1.2) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file MFPenaltySphereT.cpp Status: Needs Checkout Working revision: 1.8.20.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.8.20.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.8.20) Existing Tags: END_BRANCH_david_4 (revision: 1.8) BRANCH_david_4_merge (branch: 1.8.28) PRE_MERGE_branch_david_4 (revision: 1.8) BRANCH_david_4_premerge (branch: 1.8.26) BRANCH_Surf (branch: 1.8.24) BRANCH_Surface (branch: 1.8.22) END_david_spatial (revision: 1.8) BRANCH_david_spatial_2 (branch: 1.8.20) BRANCH_david_spatial (branch: 1.8.18) BRANCH_david_4 (branch: 1.8.16) END_BRANCH_david_3 (revision: 1.8) PRE_MERGE_branch_david_3 (revision: 1.8) BRANCH_david_3_premerge (branch: 1.8.14) BRANCH_force_1 (branch: 1.8.12) BRANCH_david_3 (branch: 1.8.10) END_BRANCH_david_2 (revision: 1.8) PRE_MERGE_BRANCH_david_2 (revision: 1.8) BRANCH_david_2_merge (branch: 1.8.8) BRANCH_spatial_1 (branch: 1.8.6) BRANCH_david_2 (branch: 1.8.4) PRE_MERGE_david_1 (revision: 1.8) TAHOE_2_1 (revision: 1.8) BRANCH_david_1 (branch: 1.8.2) TAHOE_2_0 (revision: 1.8) TAHOE_1_X (branch: 1.7.4) TAHOE_1_4 (revision: 1.7) BRANCH_parameter_4 (branch: 1.7.2) END_BRANCH_LJ3D (revision: 1.6.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.7) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.7) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.7) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.1) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.22) BRANCH_paklein_3 (branch: 1.5.18) BRANCH_THK_3 (branch: 1.5.20) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.16) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.14) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.12) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.10) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.8) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.6) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.4) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.2) PRE_MERGE_paklein_1 (revision: 1.4) END_paklein_1 (revision: 1.4.4.2) BRANCH_SIERRA_1 (branch: 1.4.6) BRANCH_paklein_1 (branch: 1.4.4) ROOT_paklein_1 (revision: 1.4) T101502 (revision: 1.4) T100102 (revision: 1.4) PRE_MERGE_B_1 (revision: 1.4) BRANCH_B_1 (branch: 1.4.2) ROOT_B_1 (revision: 1.4) T091502 (revision: 1.4) T090102 (revision: 1.3) T081502 (revision: 1.3) T080102 (revision: 1.3) T071502 (revision: 1.3) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.1) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file MFPenaltySphereT.h Status: Needs Checkout Working revision: 1.7.20.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.7.20.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.h,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.7.20) Existing Tags: END_BRANCH_david_4 (revision: 1.7) BRANCH_david_4_merge (branch: 1.7.28) PRE_MERGE_branch_david_4 (revision: 1.7) BRANCH_david_4_premerge (branch: 1.7.26) BRANCH_Surf (branch: 1.7.24) BRANCH_Surface (branch: 1.7.22) END_david_spatial (revision: 1.7) BRANCH_david_spatial_2 (branch: 1.7.20) BRANCH_david_spatial (branch: 1.7.18) BRANCH_david_4 (branch: 1.7.16) END_BRANCH_david_3 (revision: 1.7) PRE_MERGE_branch_david_3 (revision: 1.7) BRANCH_david_3_premerge (branch: 1.7.14) BRANCH_force_1 (branch: 1.7.12) BRANCH_david_3 (branch: 1.7.10) END_BRANCH_david_2 (revision: 1.7) PRE_MERGE_BRANCH_david_2 (revision: 1.7) BRANCH_david_2_merge (branch: 1.7.8) BRANCH_spatial_1 (branch: 1.7.6) BRANCH_david_2 (branch: 1.7.4) PRE_MERGE_david_1 (revision: 1.7) TAHOE_2_1 (revision: 1.7) BRANCH_david_1 (branch: 1.7.2) TAHOE_2_0 (revision: 1.7) TAHOE_1_X (branch: 1.6.38) TAHOE_1_4 (revision: 1.6) BRANCH_parameter_4 (branch: 1.6.36) END_BRANCH_LJ3D (revision: 1.6) PRE_MERGE_BRANCH_LJ3D (revision: 1.6) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.6) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.6) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.1) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.20) BRANCH_paklein_3 (branch: 1.5.16) BRANCH_THK_3 (branch: 1.5.18) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.14) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.12) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.10) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.8) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.6) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.4) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.2) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.4) PRE_MERGE_paklein_2 (revision: 1.4) END_paklein_2 (revision: 1.4) T110102 (revision: 1.4) ROOT_paklein_2 (revision: 1.4) BRANCH_paklein_2 (branch: 1.4.8) PRE_MERGE_paklein_1 (revision: 1.4) END_paklein_1 (revision: 1.4) BRANCH_SIERRA_1 (branch: 1.4.6) BRANCH_paklein_1 (branch: 1.4.4) ROOT_paklein_1 (revision: 1.4) T101502 (revision: 1.4) T100102 (revision: 1.4) PRE_MERGE_B_1 (revision: 1.4) BRANCH_B_1 (branch: 1.4.2) ROOT_B_1 (revision: 1.4) T091502 (revision: 1.4) T090102 (revision: 1.4) T081502 (revision: 1.4) T080102 (revision: 1.4) T071502 (revision: 1.4) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.1) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyCylinderT.cpp Status: Needs Checkout Working revision: 1.5.20.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.5.20.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyCylinderT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.5.20) Existing Tags: END_BRANCH_david_4 (revision: 1.5) BRANCH_david_4_merge (branch: 1.5.28) PRE_MERGE_branch_david_4 (revision: 1.5) BRANCH_david_4_premerge (branch: 1.5.26) BRANCH_Surf (branch: 1.5.24) BRANCH_Surface (branch: 1.5.22) END_david_spatial (revision: 1.5) BRANCH_david_spatial_2 (branch: 1.5.20) BRANCH_david_spatial (branch: 1.5.18) BRANCH_david_4 (branch: 1.5.16) END_BRANCH_david_3 (revision: 1.5) PRE_MERGE_branch_david_3 (revision: 1.5) BRANCH_david_3_premerge (branch: 1.5.14) BRANCH_force_1 (branch: 1.5.12) BRANCH_david_3 (branch: 1.5.10) END_BRANCH_david_2 (revision: 1.5) PRE_MERGE_BRANCH_david_2 (revision: 1.5) BRANCH_david_2_merge (branch: 1.5.8) BRANCH_spatial_1 (branch: 1.5.6) BRANCH_david_2 (branch: 1.5.4) PRE_MERGE_david_1 (revision: 1.5) TAHOE_2_1 (revision: 1.5) BRANCH_david_1 (branch: 1.5.2) TAHOE_2_0 (revision: 1.4) TAHOE_1_X (branch: 1.3.4) TAHOE_1_4 (revision: 1.3) BRANCH_parameter_4 (branch: 1.3.2) END_BRANCH_LJ3D (revision: 1.2.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.3) END_penetration_2 (revision: 1.2) PRE_MERGE_penetration_2 (revision: 1.3) END_bridging_6 (revision: 1.2) PRE_MERGE_bridging_6 (revision: 1.3) ROOT_BRANCH_NN (revision: 1.2) BRANCH_NN (branch: 1.2.34) END_bridging_5 (revision: 1.2) BRANCH_bridging_6 (branch: 1.2.32) BRANCH_LJ3D (branch: 1.2.30) ROOT_BRANCH_LJ3D (revision: 1.2) END_BRANCH_3DBS (revision: 1.2) END_BRANCH_BS3D (revision: 1.2) PRE_MERGE_BRANCH_BS3D (revision: 1.2) END_parameter_2 (revision: 1.2.12.2) BRANCH_parameter_3 (branch: 1.2.28) END_jzimmer_1 (revision: 1.2) PRE_MERGE_jzimmer_1 (revision: 1.2) END_penetration_1 (revision: 1.2) BRANCH_penetration_2 (branch: 1.2.26) BRANCH_jzimmer_1 (branch: 1.2.24) BRANCH_3DBS (branch: 1.2.22) BRANCH_penetration_1 (branch: 1.2.16) BRANCH_bridging_5 (branch: 1.2.20) END_bridging_4 (revision: 1.2) BRANCH_bridging_4 (branch: 1.2.18) BRANCH_BS3D (branch: 1.2.14) BRANCH_parameter_2 (branch: 1.2.12) ROOT_parameter_2 (revision: 1.2) TAHOE_1_3 (revision: 1.2) BRANCH_solve_1 (branch: 1.2.10) END_bsun_2 (revision: 1.2) PRE_MERGE_bsun_2 (revision: 1.2) BRANCH_bsun_2 (branch: 1.2.8) ROOT_bsun_2 (revision: 1.2) END_bsun_1 (revision: 1.2) END_bridging_3 (revision: 1.2) PRE_MERGE_bridging_3 (revision: 1.2) BRANCH_bridging_3 (branch: 1.2.6) ROOT_bridging_3 (revision: 1.2) FRACTURE_INTERFACE_0_2 (branch: 1.2.4) BRANCH_bsun_1 (branch: 1.2.2) ROOT_bsun_1 (revision: 1.2) PRE_MERGE_THK_3 (revision: 1.1) =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.21.8.1 Sat Jul 2 22:50:38 2005 Repository revision: 1.21.8.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.21.8) Existing Tags: END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_MERGE_paklein_1 (revision: 1.8) END_paklein_1 (revision: 1.8.4.2) BRANCH_SIERRA_1 (branch: 1.8.6) BRANCH_paklein_1 (branch: 1.8.4) ROOT_paklein_1 (revision: 1.8) T101502 (revision: 1.8) T100102 (revision: 1.8) PRE_MERGE_B_1 (revision: 1.8) BRANCH_B_1 (branch: 1.8.2) ROOT_B_1 (revision: 1.8) T091502 (revision: 1.8) T090102 (revision: 1.7) T081502 (revision: 1.7) T080102 (revision: 1.7) T071502 (revision: 1.7) PRE_MERGE_name_1 (branch: 1.6.4) T070102 (revision: 1.6) BRANCH_name_1 (branch: 1.6.2) T061502 (revision: 1.6) PRE_MERG_field_1 (r... [truncated message content] |
From: Patrick K. <pa...@us...> - 2005-07-03 05:40:00
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Saturday July 2, 2005 @ 22:39 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7281/src/nodes/FBC_controllers Modified Files: Tag: BRANCH_david_spatial_2 PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> PenaltyRegionT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h> Log Message: corrections for changing/non-changing node sets =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.21.8.2 Sun Jul 3 05:39:53 2005 Repository revision: 1.21.8.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.21.8) Existing Tags: END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_MERGE_paklein_1 (revision: 1.8) END_paklein_1 (revision: 1.8.4.2) BRANCH_SIERRA_1 (branch: 1.8.6) BRANCH_paklein_1 (branch: 1.8.4) ROOT_paklein_1 (revision: 1.8) T101502 (revision: 1.8) T100102 (revision: 1.8) PRE_MERGE_B_1 (revision: 1.8) BRANCH_B_1 (branch: 1.8.2) ROOT_B_1 (revision: 1.8) T091502 (revision: 1.8) T090102 (revision: 1.7) T081502 (revision: 1.7) T080102 (revision: 1.7) T071502 (revision: 1.7) PRE_MERGE_name_1 (branch: 1.6.4) T070102 (revision: 1.6) BRANCH_name_1 (branch: 1.6.2) T061502 (revision: 1.6) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5.2.3) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.2) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.4) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2.2.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyRegionT.h Status: Needs Checkout Working revision: 1.10.8.2 Sun Jul 3 05:39:53 2005 Repository revision: 1.10.8.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h,v Sticky Tag: BRANCH_david_spatial_2 (branch: 1.10.8) Existing Tags: END_BRANCH_david_4 (revision: 1.10) BRANCH_david_4_merge (branch: 1.10.16) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.14) BRANCH_Surf (branch: 1.10.12) BRANCH_Surface (branch: 1.10.10) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.8) BRANCH_david_spatial (branch: 1.10.6) BRANCH_david_4 (branch: 1.10.4) END_BRANCH_david_3 (revision: 1.8) PRE_MERGE_branch_david_3 (revision: 1.10) BRANCH_david_3_premerge (branch: 1.10.2) BRANCH_force_1 (branch: 1.8.10) BRANCH_david_3 (branch: 1.8.8) END_BRANCH_david_2 (revision: 1.8) PRE_MERGE_BRANCH_david_2 (revision: 1.8) BRANCH_david_2_merge (branch: 1.8.6) BRANCH_spatial_1 (branch: 1.8.4) BRANCH_david_2 (branch: 1.8.2) PRE_MERGE_david_1 (revision: 1.7) TAHOE_2_1 (revision: 1.7) BRANCH_david_1 (branch: 1.7.2) TAHOE_2_0 (revision: 1.7) TAHOE_1_X (branch: 1.6.38) TAHOE_1_4 (revision: 1.6) BRANCH_parameter_4 (branch: 1.6.36) END_BRANCH_LJ3D (revision: 1.6) PRE_MERGE_BRANCH_LJ3D (revision: 1.6) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.6) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.6) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.3) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.28) BRANCH_paklein_3 (branch: 1.5.24) BRANCH_THK_3 (branch: 1.5.26) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.22) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.20) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.18) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.16) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.14) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.12) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.10) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.4.3) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.4) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.2) T040102 (revision: 1.2) T031502 (revision: 1.2) T030102 (revision: 1.2) T021502 (revision: 1.2) T020102 (revision: 1.2) T011502 (revision: 1.2) T010102 (revision: 1.2) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Patrick K. <pa...@us...> - 2005-07-05 07:13:33
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Tuesday July 5, 2005 @ 0:13 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1109/src/nodes/FBC_controllers Modified Files: MFPenaltySphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp> Log Message: fCoords should be reference coordinates. Change should not affect calculations because the "current" coordinates are collected at the beginning of the calculation when the mesh is undeformed. =================================================================== File: no file MFPenaltySphereT.cpp Status: Needs Checkout Working revision: 1.9 Tue Jul 5 07:13:24 2005 Repository revision: 1.9 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp,v Existing Tags: END_BRANCH_david_4 (revision: 1.8) BRANCH_david_4_merge (branch: 1.8.28) PRE_MERGE_branch_david_4 (revision: 1.8) BRANCH_david_4_premerge (branch: 1.8.26) BRANCH_Surf (branch: 1.8.24) BRANCH_Surface (branch: 1.8.22) END_david_spatial (revision: 1.8) BRANCH_david_spatial_2 (branch: 1.8.20) BRANCH_david_spatial (branch: 1.8.18) BRANCH_david_4 (branch: 1.8.16) END_BRANCH_david_3 (revision: 1.8) PRE_MERGE_branch_david_3 (revision: 1.8) BRANCH_david_3_premerge (branch: 1.8.14) BRANCH_force_1 (branch: 1.8.12) BRANCH_david_3 (branch: 1.8.10) END_BRANCH_david_2 (revision: 1.8) PRE_MERGE_BRANCH_david_2 (revision: 1.8) BRANCH_david_2_merge (branch: 1.8.8) BRANCH_spatial_1 (branch: 1.8.6) BRANCH_david_2 (branch: 1.8.4) PRE_MERGE_david_1 (revision: 1.8) TAHOE_2_1 (revision: 1.8) BRANCH_david_1 (branch: 1.8.2) TAHOE_2_0 (revision: 1.8) TAHOE_1_X (branch: 1.7.4) TAHOE_1_4 (revision: 1.7) BRANCH_parameter_4 (branch: 1.7.2) END_BRANCH_LJ3D (revision: 1.6.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.7) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.7) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.7) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.1) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.22) BRANCH_paklein_3 (branch: 1.5.18) BRANCH_THK_3 (branch: 1.5.20) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.16) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.14) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.12) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.10) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.8) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.6) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.4) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.2) PRE_MERGE_paklein_1 (revision: 1.4) END_paklein_1 (revision: 1.4.4.2) BRANCH_SIERRA_1 (branch: 1.4.6) BRANCH_paklein_1 (branch: 1.4.4) ROOT_paklein_1 (revision: 1.4) T101502 (revision: 1.4) T100102 (revision: 1.4) PRE_MERGE_B_1 (revision: 1.4) BRANCH_B_1 (branch: 1.4.2) ROOT_B_1 (revision: 1.4) T091502 (revision: 1.4) T090102 (revision: 1.3) T081502 (revision: 1.3) T080102 (revision: 1.3) T071502 (revision: 1.3) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.1) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Patrick K. <pa...@us...> - 2005-07-20 06:49:58
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Tuesday July 19, 2005 @ 23:49 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6365/src/nodes/FBC_controllers Modified Files: PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> Log Message: use ModelManagerT method to compute nodal areas =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.22 Wed Jul 20 06:49:52 2005 Repository revision: 1.22 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Existing Tags: END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_MERGE_paklein_1 (revision: 1.8) END_paklein_1 (revision: 1.8.4.2) BRANCH_SIERRA_1 (branch: 1.8.6) BRANCH_paklein_1 (branch: 1.8.4) ROOT_paklein_1 (revision: 1.8) T101502 (revision: 1.8) T100102 (revision: 1.8) PRE_MERGE_B_1 (revision: 1.8) BRANCH_B_1 (branch: 1.8.2) ROOT_B_1 (revision: 1.8) T091502 (revision: 1.8) T090102 (revision: 1.7) T081502 (revision: 1.7) T080102 (revision: 1.7) T071502 (revision: 1.7) PRE_MERGE_name_1 (branch: 1.6.4) T070102 (revision: 1.6) BRANCH_name_1 (branch: 1.6.2) T061502 (revision: 1.6) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5.2.3) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.2) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.4) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2.2.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Patrick K. <pa...@us...> - 2005-07-25 02:37:32
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Sunday July 24, 2005 @ 19:37 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26863/src/nodes/FBC_controllers Modified Files: Tag: BRANCH_david_spatial_3 AugLagCylinderT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagCylinderT.cpp> AugLagSphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagSphereT.cpp> AugLagWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.cpp> AugLagWallT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.h> FBC_ControllerT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h> MFPenaltySphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp> MFPenaltySphereT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.h> PenaltyCylinderT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyCylinderT.cpp> PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> PenaltyRegionT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h> PenaltySphereT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltySphereT.cpp> PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: merging changes from BRANCH_david_spatial_2 =================================================================== File: no file AugLagCylinderT.cpp Status: Needs Checkout Working revision: 1.5.24.1 Mon Jul 25 02:37:22 2005 Repository revision: 1.5.24.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagCylinderT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.5.24) Existing Tags: END_david_spatial_2 (revision: 1.5.14.1) BRANCH_david_spatial_3 (branch: 1.5.24) END_BRANCH_david_4 (revision: 1.5) BRANCH_david_4_merge (branch: 1.5.22) PRE_MERGE_branch_david_4 (revision: 1.5) BRANCH_david_4_premerge (branch: 1.5.20) BRANCH_Surf (branch: 1.5.18) BRANCH_Surface (branch: 1.5.16) END_david_spatial (revision: 1.5) BRANCH_david_spatial_2 (branch: 1.5.14) BRANCH_david_spatial (branch: 1.5.12) BRANCH_david_4 (branch: 1.5.10) END_BRANCH_david_3 (revision: 1.5) PRE_MERGE_branch_david_3 (revision: 1.5) BRANCH_david_3_premerge (branch: 1.5.8) BRANCH_force_1 (branch: 1.5.6) BRANCH_david_3 (branch: 1.5.4) END_BRANCH_david_2 (revision: 1.2) PRE_MERGE_BRANCH_david_2 (revision: 1.5) BRANCH_david_2_merge (branch: 1.5.2) BRANCH_spatial_1 (branch: 1.3.2) BRANCH_david_2 (branch: 1.2.2) PRE_MERGE_david_1 (revision: 1.2) =================================================================== File: no file AugLagSphereT.cpp Status: Needs Checkout Working revision: 1.16.24.1 Mon Jul 25 02:37:22 2005 Repository revision: 1.16.24.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagSphereT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.16.24) Existing Tags: END_david_spatial_2 (revision: 1.16.14.1) BRANCH_david_spatial_3 (branch: 1.16.24) END_BRANCH_david_4 (revision: 1.16) BRANCH_david_4_merge (branch: 1.16.22) PRE_MERGE_branch_david_4 (revision: 1.16) BRANCH_david_4_premerge (branch: 1.16.20) BRANCH_Surf (branch: 1.16.18) BRANCH_Surface (branch: 1.16.16) END_david_spatial (revision: 1.16) BRANCH_david_spatial_2 (branch: 1.16.14) BRANCH_david_spatial (branch: 1.16.12) BRANCH_david_4 (branch: 1.16.10) END_BRANCH_david_3 (revision: 1.16) PRE_MERGE_branch_david_3 (revision: 1.16) BRANCH_david_3_premerge (branch: 1.16.8) BRANCH_force_1 (branch: 1.16.6) BRANCH_david_3 (branch: 1.16.4) END_BRANCH_david_2 (revision: 1.14) PRE_MERGE_BRANCH_david_2 (revision: 1.16) BRANCH_david_2_merge (branch: 1.16.2) BRANCH_spatial_1 (branch: 1.14.4) BRANCH_david_2 (branch: 1.14.2) PRE_MERGE_david_1 (revision: 1.14) TAHOE_2_1 (revision: 1.12) BRANCH_david_1 (branch: 1.12.2) TAHOE_2_0 (revision: 1.12) TAHOE_1_X (branch: 1.11.38) TAHOE_1_4 (revision: 1.11) BRANCH_parameter_4 (branch: 1.11.36) END_BRANCH_LJ3D (revision: 1.11) PRE_MERGE_BRANCH_LJ3D (revision: 1.11) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.11) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.11) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.1) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.10) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.12) BRANCH_paklein_3 (branch: 1.10.8) BRANCH_THK_3 (branch: 1.10.10) ROOT_THK_3 (revision: 1.10) END_THK_2 (revision: 1.10) PRE_MERGE_THK_2 (revision: 1.10) TAHOE_1_2 (revision: 1.10) END_bridging_2 (revision: 1.10) PRE_MERGE_bridging_2 (revision: 1.10) BRANCH_THK_2 (branch: 1.10.6) ROOT_THK_2 (revision: 1.10) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.10) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.10) BRANCH_bridging_2 (branch: 1.10.4) ROOT_bridging_2 (revision: 1.10) BRANCH_parameter_1 (branch: 1.10.2) ROOT_parameter_1 (revision: 1.10) TAHOE_1_1_0 (revision: 1.10) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.1) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.2) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.3) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file AugLagWallT.cpp Status: Needs Checkout Working revision: 1.17.24.1 Mon Jul 25 02:37:22 2005 Repository revision: 1.17.24.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.17.24) Existing Tags: END_david_spatial_2 (revision: 1.17.14.1) BRANCH_david_spatial_3 (branch: 1.17.24) END_BRANCH_david_4 (revision: 1.17) BRANCH_david_4_merge (branch: 1.17.22) PRE_MERGE_branch_david_4 (revision: 1.17) BRANCH_david_4_premerge (branch: 1.17.20) BRANCH_Surf (branch: 1.17.18) BRANCH_Surface (branch: 1.17.16) END_david_spatial (revision: 1.17) BRANCH_david_spatial_2 (branch: 1.17.14) BRANCH_david_spatial (branch: 1.17.12) BRANCH_david_4 (branch: 1.17.10) END_BRANCH_david_3 (revision: 1.17) PRE_MERGE_branch_david_3 (revision: 1.17) BRANCH_david_3_premerge (branch: 1.17.8) BRANCH_force_1 (branch: 1.17.6) BRANCH_david_3 (branch: 1.17.4) END_BRANCH_david_2 (revision: 1.15) PRE_MERGE_BRANCH_david_2 (revision: 1.17) BRANCH_david_2_merge (branch: 1.17.2) BRANCH_spatial_1 (branch: 1.16.2) BRANCH_david_2 (branch: 1.15.2) PRE_MERGE_david_1 (revision: 1.15) TAHOE_2_1 (revision: 1.12) BRANCH_david_1 (branch: 1.12.2) TAHOE_2_0 (revision: 1.12) TAHOE_1_X (branch: 1.11.38) TAHOE_1_4 (revision: 1.11) BRANCH_parameter_4 (branch: 1.11.36) END_BRANCH_LJ3D (revision: 1.11) PRE_MERGE_BRANCH_LJ3D (revision: 1.11) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.11) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.11) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.1) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.10) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.12) BRANCH_paklein_3 (branch: 1.10.8) BRANCH_THK_3 (branch: 1.10.10) ROOT_THK_3 (revision: 1.10) END_THK_2 (revision: 1.10) PRE_MERGE_THK_2 (revision: 1.10) TAHOE_1_2 (revision: 1.10) END_bridging_2 (revision: 1.10) PRE_MERGE_bridging_2 (revision: 1.10) BRANCH_THK_2 (branch: 1.10.6) ROOT_THK_2 (revision: 1.10) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.10) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.10) BRANCH_bridging_2 (branch: 1.10.4) ROOT_bridging_2 (revision: 1.10) BRANCH_parameter_1 (branch: 1.10.2) ROOT_parameter_1 (revision: 1.10) TAHOE_1_1_0 (revision: 1.10) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.1) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.2.2) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.2) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.1) T040102 (revision: 1.1) T031502 (revision: 1.1) T030102 (revision: 1.1) T021502 (revision: 1.1) T020102 (revision: 1.1) T011502 (revision: 1.1) T010102 (revision: 1.1) PRE_MERGE_model_1 (revision: 1.1) END_model_1 (revision: 1.1) T121501 (revision: 1.1) T120101 (revision: 1.1) T111501 (revision: 1.1) T110101 (revision: 1.1) T101501 (revision: 1.1) T100101 (revision: 1.1) BRANCH_model_1 (branch: 1.1.2) ROOT_model_1 (revision: 1.1) T091501 (revision: 1.1) =================================================================== File: no file AugLagWallT.h Status: Needs Checkout Working revision: 1.13.24.1 Mon Jul 25 02:37:22 2005 Repository revision: 1.13.24.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/AugLagWallT.h,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.13.24) Existing Tags: END_david_spatial_2 (revision: 1.13.14.1) BRANCH_david_spatial_3 (branch: 1.13.24) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.22) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.20) BRANCH_Surf (branch: 1.13.18) BRANCH_Surface (branch: 1.13.16) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.14) BRANCH_david_spatial (branch: 1.13.12) BRANCH_david_4 (branch: 1.13.10) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.8) BRANCH_force_1 (branch: 1.13.6) BRANCH_david_3 (branch: 1.13.4) END_BRANCH_david_2 (revision: 1.12) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.2) BRANCH_spatial_1 (branch: 1.12.4) BRANCH_david_2 (branch: 1.12.2) PRE_MERGE_david_1 (revision: 1.12) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.28) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.26) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.24) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.22) BRANCH_LJ3D (branch: 1.9.20) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.2.1) BRANCH_parameter_3 (branch: 1.9.18) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.16) BRANCH_jzimmer_1 (branch: 1.9.14) BRANCH_3DBS (branch: 1.9.12) BRANCH_penetration_1 (branch: 1.9.6) BRANCH_bridging_5 (branch: 1.9.10) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.8) BRANCH_BS3D (branch: 1.9.4) BRANCH_parameter_2 (branch: 1.9.2) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.7.8.1) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.8.10) END_bsun_2 (revision: 1.8) PRE_MERGE_bsun_2 (revision: 1.8) BRANCH_bsun_2 (branch: 1.8.8) ROOT_bsun_2 (revision: 1.8) END_bsun_1 (revision: 1.8) END_bridging_3 (revision: 1.8) PRE_MERGE_bridging_3 (revision: 1.8) BRANCH_bridging_3 (branch: 1.8.6) ROOT_bridging_3 (revision: 1.8) FRACTURE_INTERFACE_0_2 (branch: 1.8.4) BRANCH_bsun_1 (branch: 1.8.2) ROOT_bsun_1 (revision: 1.8) END_THK_3 (revision: 1.7) PRE_MERGE_THK_3 (revision: 1.7) BRANCH_cjkimme_1 (branch: 1.7.12) BRANCH_paklein_3 (branch: 1.7.8) BRANCH_THK_3 (branch: 1.7.10) ROOT_THK_3 (revision: 1.7) END_THK_2 (revision: 1.7) PRE_MERGE_THK_2 (revision: 1.7) TAHOE_1_2 (revision: 1.7) END_bridging_2 (revision: 1.7) PRE_MERGE_bridging_2 (revision: 1.7) BRANCH_THK_2 (branch: 1.7.6) ROOT_THK_2 (revision: 1.7) END_THK_1 (revision: 1.6) PRE_MERGE_THK_1 (revision: 1.7) END_bridging_1 (revision: 1.6) END_atom_1 (revision: 1.6) END_parameter_1 (revision: 1.7) BRANCH_bridging_2 (branch: 1.7.4) ROOT_bridging_2 (revision: 1.7) BRANCH_parameter_1 (branch: 1.7.2) ROOT_parameter_1 (revision: 1.7) TAHOE_1_1_0 (revision: 1.7) BRANCH_THK_1 (branch: 1.6.8) ROOT_THK_1 (revision: 1.6) PRE_MERGE_bridging_1 (revision: 1.6) BRANCH_conveyor_1 (branch: 1.6.6) TAHOE_1_0_1 (revision: 1.6) BRANCH_bridging_1 (branch: 1.6.4) ROOT_bridging_1 (revision: 1.6) TAHOE_1_0_0 (revision: 1.6) PRE_MERGE_atom_1 (revision: 1.6) T011503 (revision: 1.6) T010103 (revision: 1.6) T121502 (revision: 1.6) BRANCH_atom_1 (branch: 1.6.2) ROOT_atom_1 (revision: 1.6) T120102 (revision: 1.6) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.2.1) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.2) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.1) T040102 (revision: 1.1) T031502 (revision: 1.1) T030102 (revision: 1.1) T021502 (revision: 1.1) T020102 (revision: 1.1) T011502 (revision: 1.1) T010102 (revision: 1.1) PRE_MERGE_model_1 (revision: 1.1) END_model_1 (revision: 1.1) T121501 (revision: 1.1) T120101 (revision: 1.1) T111501 (revision: 1.1) T110101 (revision: 1.1) T101501 (revision: 1.1) T100101 (revision: 1.1) BRANCH_model_1 (branch: 1.1.2) ROOT_model_1 (revision: 1.1) T091501 (revision: 1.1) =================================================================== File: no file FBC_ControllerT.h Status: Needs Checkout Working revision: 1.17.14.1 Mon Jul 25 02:37:23 2005 Repository revision: 1.17.14.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.17.14) Existing Tags: END_david_spatial_2 (revision: 1.17.4.1) BRANCH_david_spatial_3 (branch: 1.17.14) END_BRANCH_david_4 (revision: 1.16) BRANCH_david_4_merge (branch: 1.17.12) PRE_MERGE_branch_david_4 (revision: 1.17) BRANCH_david_4_premerge (branch: 1.17.10) BRANCH_Surf (branch: 1.17.8) BRANCH_Surface (branch: 1.17.6) END_david_spatial (revision: 1.17) BRANCH_david_spatial_2 (branch: 1.17.4) BRANCH_david_spatial (branch: 1.17.2) BRANCH_david_4 (branch: 1.16.14) END_BRANCH_david_3 (revision: 1.16) PRE_MERGE_branch_david_3 (revision: 1.16) BRANCH_david_3_premerge (branch: 1.16.12) BRANCH_force_1 (branch: 1.16.10) BRANCH_david_3 (branch: 1.16.8) END_BRANCH_david_2 (revision: 1.16) PRE_MERGE_BRANCH_david_2 (revision: 1.16) BRANCH_david_2_merge (branch: 1.16.6) BRANCH_spatial_1 (branch: 1.16.4) BRANCH_david_2 (branch: 1.16.2) PRE_MERGE_david_1 (revision: 1.16) TAHOE_2_1 (revision: 1.14) BRANCH_david_1 (branch: 1.14.2) TAHOE_2_0 (revision: 1.14) TAHOE_1_X (branch: 1.13.6) TAHOE_1_4 (revision: 1.13) BRANCH_parameter_4 (branch: 1.13.4) END_BRANCH_LJ3D (revision: 1.12) PRE_MERGE_BRANCH_LJ3D (revision: 1.13) END_penetration_2 (revision: 1.12) PRE_MERGE_penetration_2 (revision: 1.13) END_bridging_6 (revision: 1.12) PRE_MERGE_bridging_6 (revision: 1.13) ROOT_BRANCH_NN (revision: 1.13) BRANCH_NN (branch: 1.13.2) END_bridging_5 (revision: 1.12) BRANCH_bridging_6 (branch: 1.12.32) BRANCH_LJ3D (branch: 1.12.30) ROOT_BRANCH_LJ3D (revision: 1.12) END_BRANCH_3DBS (revision: 1.12) END_BRANCH_BS3D (revision: 1.12) PRE_MERGE_BRANCH_BS3D (revision: 1.12) END_parameter_2 (revision: 1.12.12.3) BRANCH_parameter_3 (branch: 1.12.28) END_jzimmer_1 (revision: 1.12) PRE_MERGE_jzimmer_1 (revision: 1.12) END_penetration_1 (revision: 1.12) BRANCH_penetration_2 (branch: 1.12.26) BRANCH_jzimmer_1 (branch: 1.12.24) BRANCH_3DBS (branch: 1.12.22) BRANCH_penetration_1 (branch: 1.12.16) BRANCH_bridging_5 (branch: 1.12.20) END_bridging_4 (revision: 1.12) BRANCH_bridging_4 (branch: 1.12.18) BRANCH_BS3D (branch: 1.12.14) BRANCH_parameter_2 (branch: 1.12.12) ROOT_parameter_2 (revision: 1.12) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.12) BRANCH_solve_1 (branch: 1.12.10) END_bsun_2 (revision: 1.12) PRE_MERGE_bsun_2 (revision: 1.12) BRANCH_bsun_2 (branch: 1.12.8) ROOT_bsun_2 (revision: 1.12) END_bsun_1 (revision: 1.12) END_bridging_3 (revision: 1.12) PRE_MERGE_bridging_3 (revision: 1.12) BRANCH_bridging_3 (branch: 1.12.6) ROOT_bridging_3 (revision: 1.12) FRACTURE_INTERFACE_0_2 (branch: 1.12.4) BRANCH_bsun_1 (branch: 1.12.2) ROOT_bsun_1 (revision: 1.12) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.11) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.10) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.6) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.8) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.8) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.4) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.2) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.8.6) ROOT_THK_1 (revision: 1.8) PRE_MERGE_bridging_1 (revision: 1.8) BRANCH_conveyor_1 (branch: 1.8.4) TAHOE_1_0_1 (revision: 1.8) BRANCH_bridging_1 (branch: 1.8.2) ROOT_bridging_1 (revision: 1.8) TAHOE_1_0_0 (revision: 1.8) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5.8.1) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.4.3) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.4) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.2) T040102 (revision: 1.2) T031502 (revision: 1.2) T030102 (revision: 1.2) T021502 (revision: 1.2) T020102 (revision: 1.2) T011502 (revision: 1.2) T010102 (revision: 1.2) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file MFPenaltySphereT.cpp Status: Needs Checkout Working revision: 1.9.2.1 Mon Jul 25 02:37:23 2005 Repository revision: 1.9.2.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.9.2) Existing Tags: END_david_spatial_2 (revision: 1.8.20.1) BRANCH_david_spatial_3 (branch: 1.9.2) END_BRANCH_david_4 (revision: 1.8) BRANCH_david_4_merge (branch: 1.8.28) PRE_MERGE_branch_david_4 (revision: 1.8) BRANCH_david_4_premerge (branch: 1.8.26) BRANCH_Surf (branch: 1.8.24) BRANCH_Surface (branch: 1.8.22) END_david_spatial (revision: 1.8) BRANCH_david_spatial_2 (branch: 1.8.20) BRANCH_david_spatial (branch: 1.8.18) BRANCH_david_4 (branch: 1.8.16) END_BRANCH_david_3 (revision: 1.8) PRE_MERGE_branch_david_3 (revision: 1.8) BRANCH_david_3_premerge (branch: 1.8.14) BRANCH_force_1 (branch: 1.8.12) BRANCH_david_3 (branch: 1.8.10) END_BRANCH_david_2 (revision: 1.8) PRE_MERGE_BRANCH_david_2 (revision: 1.8) BRANCH_david_2_merge (branch: 1.8.8) BRANCH_spatial_1 (branch: 1.8.6) BRANCH_david_2 (branch: 1.8.4) PRE_MERGE_david_1 (revision: 1.8) TAHOE_2_1 (revision: 1.8) BRANCH_david_1 (branch: 1.8.2) TAHOE_2_0 (revision: 1.8) TAHOE_1_X (branch: 1.7.4) TAHOE_1_4 (revision: 1.7) BRANCH_parameter_4 (branch: 1.7.2) END_BRANCH_LJ3D (revision: 1.6.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.7) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.7) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.7) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.1) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.22) BRANCH_paklein_3 (branch: 1.5.18) BRANCH_THK_3 (branch: 1.5.20) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.16) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.14) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.12) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.10) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.8) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.6) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.4) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.2) PRE_MERGE_paklein_1 (revision: 1.4) END_paklein_1 (revision: 1.4.4.2) BRANCH_SIERRA_1 (branch: 1.4.6) BRANCH_paklein_1 (branch: 1.4.4) ROOT_paklein_1 (revision: 1.4) T101502 (revision: 1.4) T100102 (revision: 1.4) PRE_MERGE_B_1 (revision: 1.4) BRANCH_B_1 (branch: 1.4.2) ROOT_B_1 (revision: 1.4) T091502 (revision: 1.4) T090102 (revision: 1.3) T081502 (revision: 1.3) T080102 (revision: 1.3) T071502 (revision: 1.3) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.1) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file MFPenaltySphereT.h Status: Needs Checkout Working revision: 1.7.30.1 Mon Jul 25 02:37:23 2005 Repository revision: 1.7.30.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/MFPenaltySphereT.h,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.7.30) Existing Tags: END_david_spatial_2 (revision: 1.7.20.1) BRANCH_david_spatial_3 (branch: 1.7.30) END_BRANCH_david_4 (revision: 1.7) BRANCH_david_4_merge (branch: 1.7.28) PRE_MERGE_branch_david_4 (revision: 1.7) BRANCH_david_4_premerge (branch: 1.7.26) BRANCH_Surf (branch: 1.7.24) BRANCH_Surface (branch: 1.7.22) END_david_spatial (revision: 1.7) BRANCH_david_spatial_2 (branch: 1.7.20) BRANCH_david_spatial (branch: 1.7.18) BRANCH_david_4 (branch: 1.7.16) END_BRANCH_david_3 (revision: 1.7) PRE_MERGE_branch_david_3 (revision: 1.7) BRANCH_david_3_premerge (branch: 1.7.14) BRANCH_force_1 (branch: 1.7.12) BRANCH_david_3 (branch: 1.7.10) END_BRANCH_david_2 (revision: 1.7) PRE_MERGE_BRANCH_david_2 (revision: 1.7) BRANCH_david_2_merge (branch: 1.7.8) BRANCH_spatial_1 (branch: 1.7.6) BRANCH_david_2 (branch: 1.7.4) PRE_MERGE_david_1 (revision: 1.7) TAHOE_2_1 (revision: 1.7) BRANCH_david_1 (branch: 1.7.2) TAHOE_2_0 (revision: 1.7) TAHOE_1_X (branch: 1.6.38) TAHOE_1_4 (revision: 1.6) BRANCH_parameter_4 (branch: 1.6.36) END_BRANCH_LJ3D (revision: 1.6) PRE_MERGE_BRANCH_LJ3D (revision: 1.6) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.6) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.6) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.1) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.20) BRANCH_paklein_3 (branch: 1.5.16) BRANCH_THK_3 (branch: 1.5.18) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.14) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.12) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.10) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.8) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.6) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.4) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.2) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.4) PRE_MERGE_paklein_2 (revision: 1.4) END_paklein_2 (revision: 1.4) T110102 (revision: 1.4) ROOT_paklein_2 (revision: 1.4) BRANCH_paklein_2 (branch: 1.4.8) PRE_MERGE_paklein_1 (revision: 1.4) END_paklein_1 (revision: 1.4) BRANCH_SIERRA_1 (branch: 1.4.6) BRANCH_paklein_1 (branch: 1.4.4) ROOT_paklein_1 (revision: 1.4) T101502 (revision: 1.4) T100102 (revision: 1.4) PRE_MERGE_B_1 (revision: 1.4) BRANCH_B_1 (branch: 1.4.2) ROOT_B_1 (revision: 1.4) T091502 (revision: 1.4) T090102 (revision: 1.4) T081502 (revision: 1.4) T080102 (revision: 1.4) T071502 (revision: 1.4) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.1) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyCylinderT.cpp Status: Needs Checkout Working revision: 1.5.30.1 Mon Jul 25 02:37:23 2005 Repository revision: 1.5.30.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyCylinderT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.5.30) Existing Tags: END_david_spatial_2 (revision: 1.5.20.1) BRANCH_david_spatial_3 (branch: 1.5.30) END_BRANCH_david_4 (revision: 1.5) BRANCH_david_4_merge (branch: 1.5.28) PRE_MERGE_branch_david_4 (revision: 1.5) BRANCH_david_4_premerge (branch: 1.5.26) BRANCH_Surf (branch: 1.5.24) BRANCH_Surface (branch: 1.5.22) END_david_spatial (revision: 1.5) BRANCH_david_spatial_2 (branch: 1.5.20) BRANCH_david_spatial (branch: 1.5.18) BRANCH_david_4 (branch: 1.5.16) END_BRANCH_david_3 (revision: 1.5) PRE_MERGE_branch_david_3 (revision: 1.5) BRANCH_david_3_premerge (branch: 1.5.14) BRANCH_force_1 (branch: 1.5.12) BRANCH_david_3 (branch: 1.5.10) END_BRANCH_david_2 (revision: 1.5) PRE_MERGE_BRANCH_david_2 (revision: 1.5) BRANCH_david_2_merge (branch: 1.5.8) BRANCH_spatial_1 (branch: 1.5.6) BRANCH_david_2 (branch: 1.5.4) PRE_MERGE_david_1 (revision: 1.5) TAHOE_2_1 (revision: 1.5) BRANCH_david_1 (branch: 1.5.2) TAHOE_2_0 (revision: 1.4) TAHOE_1_X (branch: 1.3.4) TAHOE_1_4 (revision: 1.3) BRANCH_parameter_4 (branch: 1.3.2) END_BRANCH_LJ3D (revision: 1.2.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.3) END_penetration_2 (revision: 1.2) PRE_MERGE_penetration_2 (revision: 1.3) END_bridging_6 (revision: 1.2) PRE_MERGE_bridging_6 (revision: 1.3) ROOT_BRANCH_NN (revision: 1.2) BRANCH_NN (branch: 1.2.34) END_bridging_5 (revision: 1.2) BRANCH_bridging_6 (branch: 1.2.32) BRANCH_LJ3D (branch: 1.2.30) ROOT_BRANCH_LJ3D (revision: 1.2) END_BRANCH_3DBS (revision: 1.2) END_BRANCH_BS3D (revision: 1.2) PRE_MERGE_BRANCH_BS3D (revision: 1.2) END_parameter_2 (revision: 1.2.12.2) BRANCH_parameter_3 (branch: 1.2.28) END_jzimmer_1 (revision: 1.2) PRE_MERGE_jzimmer_1 (revision: 1.2) END_penetration_1 (revision: 1.2) BRANCH_penetration_2 (branch: 1.2.26) BRANCH_jzimmer_1 (branch: 1.2.24) BRANCH_3DBS (branch: 1.2.22) BRANCH_penetration_1 (branch: 1.2.16) BRANCH_bridging_5 (branch: 1.2.20) END_bridging_4 (revision: 1.2) BRANCH_bridging_4 (branch: 1.2.18) BRANCH_BS3D (branch: 1.2.14) BRANCH_parameter_2 (branch: 1.2.12) ROOT_parameter_2 (revision: 1.2) TAHOE_1_3 (revision: 1.2) BRANCH_solve_1 (branch: 1.2.10) END_bsun_2 (revision: 1.2) PRE_MERGE_bsun_2 (revision: 1.2) BRANCH_bsun_2 (branch: 1.2.8) ROOT_bsun_2 (revision: 1.2) END_bsun_1 (revision: 1.2) END_bridging_3 (revision: 1.2) PRE_MERGE_bridging_3 (revision: 1.2) BRANCH_bridging_3 (branch: 1.2.6) ROOT_bridging_3 (revision: 1.2) FRACTURE_INTERFACE_0_2 (branch: 1.2.4) BRANCH_bsun_1 (branch: 1.2.2) ROOT_bsun_1 (revision: 1.2) PRE_MERGE_THK_3 (revision: 1.1) =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.22.2.1 Mon Jul 25 02:37:23 2005 Repository revision: 1.22.2.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Sticky Tag: BRANCH_david_spatial_3 (branch: 1.22.2) Existing Tags: END_david_spatial_2 (revision: 1.21.8.2) BRANCH_david_spatial_3 (branch: 1.22.2) END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_M... [truncated message content] |
From: Patrick K. <pa...@us...> - 2005-08-12 05:21:08
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Thursday August 11, 2005 @ 22:21 Author: pa...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2818/src/nodes/FBC_controllers Modified Files: makefile: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/makefile> Log Message: some file systems don't have /dev/null =================================================================== File: no file makefile Status: Needs Checkout Working revision: 1.11 Fri Aug 12 05:21:01 2005 Repository revision: 1.11 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/makefile,v Existing Tags: BRANCH_david_5 (branch: 1.10.16) END_david_spatial_2 (revision: 1.10) BRANCH_david_spatial_3 (branch: 1.10.14) END_BRANCH_david_4 (revision: 1.9) BRANCH_david_4_merge (branch: 1.10.12) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.10) BRANCH_Surf (branch: 1.10.8) BRANCH_Surface (branch: 1.10.6) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.4) BRANCH_david_spatial (branch: 1.10.2) BRANCH_david_4 (branch: 1.9.14) END_BRANCH_david_3 (revision: 1.9) PRE_MERGE_branch_david_3 (revision: 1.9) BRANCH_david_3_premerge (branch: 1.9.12) BRANCH_force_1 (branch: 1.9.10) BRANCH_david_3 (branch: 1.9.8) END_BRANCH_david_2 (revision: 1.9) PRE_MERGE_BRANCH_david_2 (revision: 1.9) BRANCH_david_2_merge (branch: 1.9.6) BRANCH_spatial_1 (branch: 1.9.4) BRANCH_david_2 (branch: 1.9.2) PRE_MERGE_david_1 (revision: 1.9) TAHOE_2_1 (revision: 1.8) BRANCH_david_1 (branch: 1.8.8) TAHOE_2_0 (revision: 1.8) TAHOE_1_X (branch: 1.8.6) TAHOE_1_4 (revision: 1.8) BRANCH_parameter_4 (branch: 1.8.4) END_BRANCH_LJ3D (revision: 1.7) PRE_MERGE_BRANCH_LJ3D (revision: 1.8) END_penetration_2 (revision: 1.7) PRE_MERGE_penetration_2 (revision: 1.8) END_bridging_6 (revision: 1.7) PRE_MERGE_bridging_6 (revision: 1.8) ROOT_BRANCH_NN (revision: 1.8) BRANCH_NN (branch: 1.8.2) END_bridging_5 (revision: 1.7) BRANCH_bridging_6 (branch: 1.7.32) BRANCH_LJ3D (branch: 1.7.30) ROOT_BRANCH_LJ3D (revision: 1.7) END_BRANCH_3DBS (revision: 1.7) END_BRANCH_BS3D (revision: 1.7) PRE_MERGE_BRANCH_BS3D (revision: 1.7) END_parameter_2 (revision: 1.7) BRANCH_parameter_3 (branch: 1.7.28) END_jzimmer_1 (revision: 1.7) PRE_MERGE_jzimmer_1 (revision: 1.7) END_penetration_1 (revision: 1.7) BRANCH_penetration_2 (branch: 1.7.26) BRANCH_jzimmer_1 (branch: 1.7.24) BRANCH_3DBS (branch: 1.7.22) BRANCH_penetration_1 (branch: 1.7.16) BRANCH_bridging_5 (branch: 1.7.20) END_bridging_4 (revision: 1.7) BRANCH_bridging_4 (branch: 1.7.18) BRANCH_BS3D (branch: 1.7.14) BRANCH_parameter_2 (branch: 1.7.12) ROOT_parameter_2 (revision: 1.7) END_paklein_3 (revision: 1.6) TAHOE_1_3 (revision: 1.7) BRANCH_solve_1 (branch: 1.7.10) END_bsun_2 (revision: 1.7) PRE_MERGE_bsun_2 (revision: 1.7) BRANCH_bsun_2 (branch: 1.7.8) ROOT_bsun_2 (revision: 1.7) END_bsun_1 (revision: 1.7) END_bridging_3 (revision: 1.7) PRE_MERGE_bridging_3 (revision: 1.7) BRANCH_bridging_3 (branch: 1.7.6) ROOT_bridging_3 (revision: 1.7) FRACTURE_INTERFACE_0_2 (branch: 1.7.4) BRANCH_bsun_1 (branch: 1.7.2) ROOT_bsun_1 (revision: 1.7) END_THK_3 (revision: 1.6) PRE_MERGE_THK_3 (revision: 1.7) BRANCH_cjkimme_1 (branch: 1.6.16) BRANCH_paklein_3 (branch: 1.6.12) BRANCH_THK_3 (branch: 1.6.14) ROOT_THK_3 (revision: 1.6) END_THK_2 (revision: 1.6) PRE_MERGE_THK_2 (revision: 1.6) TAHOE_1_2 (revision: 1.6) END_bridging_2 (revision: 1.6) PRE_MERGE_bridging_2 (revision: 1.6) BRANCH_THK_2 (branch: 1.6.10) ROOT_THK_2 (revision: 1.6) END_THK_1 (revision: 1.6) PRE_MERGE_THK_1 (revision: 1.6) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.6) BRANCH_bridging_2 (branch: 1.6.8) ROOT_bridging_2 (revision: 1.6) BRANCH_parameter_1 (branch: 1.6.6) ROOT_parameter_1 (revision: 1.6) TAHOE_1_1_0 (revision: 1.6) BRANCH_THK_1 (branch: 1.6.4) ROOT_THK_1 (revision: 1.6) PRE_MERGE_bridging_1 (revision: 1.6) BRANCH_conveyor_1 (branch: 1.6.2) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.20) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.18) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.16) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.14) BRANCH_paklein_1 (branch: 1.5.12) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.10) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.5.8) T070102 (revision: 1.5) BRANCH_name_1 (branch: 1.5.6) T061502 (revision: 1.5) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.4) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.5) T010102 (revision: 1.5) PRE_MERGE_model_1 (revision: 1.5) END_model_1 (revision: 1.5) T121501 (revision: 1.5) T120101 (revision: 1.5) T111501 (revision: 1.5) T110101 (revision: 1.5) T101501 (revision: 1.5) T100101 (revision: 1.5) BRANCH_model_1 (branch: 1.5.2) ROOT_model_1 (revision: 1.5) T091501 (revision: 1.5) T090101 (revision: 1.4) T081501 (revision: 1.4) T080101 (revision: 1.4) T071501 (revision: 1.4) END_solid_1 (revision: 1.4) PRE_MERGE_solid_1 (revision: 1.4) T070101 (revision: 1.4) END_meshfree_1 (revision: 1.4) BRANCH_meshfree_1 (branch: 1.4.4) ROOT_meshfree_1 (revision: 1.4) T061501 (revision: 1.4) BRANCH_solid_1 (branch: 1.4.2) ROOT_solid_1 (revision: 1.4) T060101 (revision: 1.4) T051601 (revision: 1.4) T050101 (revision: 1.4) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-10-28 13:55:39
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Friday October 28, 2005 @ 6:55 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20615 Modified Files: PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> PenaltyRegionT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h> Log Message: read in fmu friction coefficient, but not yet used =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.23 Fri Oct 28 13:55:29 2005 Repository revision: 1.23 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.22) PREMERGE_BRANCH_david_5 (revision: 1.22) BRANCH_david_5 (branch: 1.22.4) END_david_spatial_2 (revision: 1.21.8.2) BRANCH_david_spatial_3 (branch: 1.22.2) END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_MERGE_paklein_1 (revision: 1.8) END_paklein_1 (revision: 1.8.4.2) BRANCH_SIERRA_1 (branch: 1.8.6) BRANCH_paklein_1 (branch: 1.8.4) ROOT_paklein_1 (revision: 1.8) T101502 (revision: 1.8) T100102 (revision: 1.8) PRE_MERGE_B_1 (revision: 1.8) BRANCH_B_1 (branch: 1.8.2) ROOT_B_1 (revision: 1.8) T091502 (revision: 1.8) T090102 (revision: 1.7) T081502 (revision: 1.7) T080102 (revision: 1.7) T071502 (revision: 1.7) PRE_MERGE_name_1 (branch: 1.6.4) T070102 (revision: 1.6) BRANCH_name_1 (branch: 1.6.2) T061502 (revision: 1.6) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5.2.3) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.2) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.4) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2.2.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyRegionT.h Status: Needs Checkout Working revision: 1.11 Fri Oct 28 13:55:29 2005 Repository revision: 1.11 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.h,v Existing Tags: END_BRANCH_david_5 (revision: 1.10) PREMERGE_BRANCH_david_5 (revision: 1.10) BRANCH_david_5 (branch: 1.10.20) END_david_spatial_2 (revision: 1.10.8.2) BRANCH_david_spatial_3 (branch: 1.10.18) END_BRANCH_david_4 (revision: 1.10) BRANCH_david_4_merge (branch: 1.10.16) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.14) BRANCH_Surf (branch: 1.10.12) BRANCH_Surface (branch: 1.10.10) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.8) BRANCH_david_spatial (branch: 1.10.6) BRANCH_david_4 (branch: 1.10.4) END_BRANCH_david_3 (revision: 1.8) PRE_MERGE_branch_david_3 (revision: 1.10) BRANCH_david_3_premerge (branch: 1.10.2) BRANCH_force_1 (branch: 1.8.10) BRANCH_david_3 (branch: 1.8.8) END_BRANCH_david_2 (revision: 1.8) PRE_MERGE_BRANCH_david_2 (revision: 1.8) BRANCH_david_2_merge (branch: 1.8.6) BRANCH_spatial_1 (branch: 1.8.4) BRANCH_david_2 (branch: 1.8.2) PRE_MERGE_david_1 (revision: 1.7) TAHOE_2_1 (revision: 1.7) BRANCH_david_1 (branch: 1.7.2) TAHOE_2_0 (revision: 1.7) TAHOE_1_X (branch: 1.6.38) TAHOE_1_4 (revision: 1.6) BRANCH_parameter_4 (branch: 1.6.36) END_BRANCH_LJ3D (revision: 1.6) PRE_MERGE_BRANCH_LJ3D (revision: 1.6) END_penetration_2 (revision: 1.6) PRE_MERGE_penetration_2 (revision: 1.6) END_bridging_6 (revision: 1.6) PRE_MERGE_bridging_6 (revision: 1.6) ROOT_BRANCH_NN (revision: 1.6) BRANCH_NN (branch: 1.6.34) END_bridging_5 (revision: 1.6) BRANCH_bridging_6 (branch: 1.6.32) BRANCH_LJ3D (branch: 1.6.30) ROOT_BRANCH_LJ3D (revision: 1.6) END_BRANCH_3DBS (revision: 1.6) END_BRANCH_BS3D (revision: 1.6) PRE_MERGE_BRANCH_BS3D (revision: 1.6) END_parameter_2 (revision: 1.6.12.3) BRANCH_parameter_3 (branch: 1.6.28) END_jzimmer_1 (revision: 1.6) PRE_MERGE_jzimmer_1 (revision: 1.6) END_penetration_1 (revision: 1.6) BRANCH_penetration_2 (branch: 1.6.26) BRANCH_jzimmer_1 (branch: 1.6.24) BRANCH_3DBS (branch: 1.6.22) BRANCH_penetration_1 (branch: 1.6.16) BRANCH_bridging_5 (branch: 1.6.20) END_bridging_4 (revision: 1.6) BRANCH_bridging_4 (branch: 1.6.18) BRANCH_BS3D (branch: 1.6.14) BRANCH_parameter_2 (branch: 1.6.12) ROOT_parameter_2 (revision: 1.6) END_paklein_3 (revision: 1.5) TAHOE_1_3 (revision: 1.6) BRANCH_solve_1 (branch: 1.6.10) END_bsun_2 (revision: 1.6) PRE_MERGE_bsun_2 (revision: 1.6) BRANCH_bsun_2 (branch: 1.6.8) ROOT_bsun_2 (revision: 1.6) END_bsun_1 (revision: 1.6) END_bridging_3 (revision: 1.6) PRE_MERGE_bridging_3 (revision: 1.6) BRANCH_bridging_3 (branch: 1.6.6) ROOT_bridging_3 (revision: 1.6) FRACTURE_INTERFACE_0_2 (branch: 1.6.4) BRANCH_bsun_1 (branch: 1.6.2) ROOT_bsun_1 (revision: 1.6) END_THK_3 (revision: 1.5) PRE_MERGE_THK_3 (revision: 1.5) BRANCH_cjkimme_1 (branch: 1.5.28) BRANCH_paklein_3 (branch: 1.5.24) BRANCH_THK_3 (branch: 1.5.26) ROOT_THK_3 (revision: 1.5) END_THK_2 (revision: 1.5) PRE_MERGE_THK_2 (revision: 1.5) TAHOE_1_2 (revision: 1.5) END_bridging_2 (revision: 1.5) PRE_MERGE_bridging_2 (revision: 1.5) BRANCH_THK_2 (branch: 1.5.22) ROOT_THK_2 (revision: 1.5) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.5) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.5) BRANCH_bridging_2 (branch: 1.5.20) ROOT_bridging_2 (revision: 1.5) BRANCH_parameter_1 (branch: 1.5.18) ROOT_parameter_1 (revision: 1.5) TAHOE_1_1_0 (revision: 1.5) BRANCH_THK_1 (branch: 1.5.16) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.5) BRANCH_conveyor_1 (branch: 1.5.14) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.12) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.10) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.4.3) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.4) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.2) T040102 (revision: 1.2) T031502 (revision: 1.2) T030102 (revision: 1.2) T021502 (revision: 1.2) T020102 (revision: 1.2) T011502 (revision: 1.2) T010102 (revision: 1.2) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-10-30 03:37:02
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Saturday October 29, 2005 @ 20:36 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26737 Modified Files: PenaltyRegionT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp> Log Message: add line to set default value for friction coefficient mu =================================================================== File: no file PenaltyRegionT.cpp Status: Needs Checkout Working revision: 1.24 Sun Oct 30 03:36:56 2005 Repository revision: 1.24 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyRegionT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.22) PREMERGE_BRANCH_david_5 (revision: 1.22) BRANCH_david_5 (branch: 1.22.4) END_david_spatial_2 (revision: 1.21.8.2) BRANCH_david_spatial_3 (branch: 1.22.2) END_BRANCH_david_4 (revision: 1.21) BRANCH_david_4_merge (branch: 1.21.16) PRE_MERGE_branch_david_4 (revision: 1.21) BRANCH_david_4_premerge (branch: 1.21.14) BRANCH_Surf (branch: 1.21.12) BRANCH_Surface (branch: 1.21.10) END_david_spatial (revision: 1.21) BRANCH_david_spatial_2 (branch: 1.21.8) BRANCH_david_spatial (branch: 1.21.6) BRANCH_david_4 (branch: 1.21.4) END_BRANCH_david_3 (revision: 1.19) PRE_MERGE_branch_david_3 (revision: 1.21) BRANCH_david_3_premerge (branch: 1.21.2) BRANCH_force_1 (branch: 1.19.10) BRANCH_david_3 (branch: 1.19.8) END_BRANCH_david_2 (revision: 1.19) PRE_MERGE_BRANCH_david_2 (revision: 1.19) BRANCH_david_2_merge (branch: 1.19.6) BRANCH_spatial_1 (branch: 1.19.4) BRANCH_david_2 (branch: 1.19.2) PRE_MERGE_david_1 (revision: 1.18) TAHOE_2_1 (revision: 1.18) BRANCH_david_1 (branch: 1.18.2) TAHOE_2_0 (revision: 1.17) TAHOE_1_X (branch: 1.16.4) TAHOE_1_4 (revision: 1.16) BRANCH_parameter_4 (branch: 1.16.2) END_BRANCH_LJ3D (revision: 1.15.22.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.16) END_penetration_2 (revision: 1.15) PRE_MERGE_penetration_2 (revision: 1.16) END_bridging_6 (revision: 1.15) PRE_MERGE_bridging_6 (revision: 1.16) ROOT_BRANCH_NN (revision: 1.15) BRANCH_NN (branch: 1.15.26) END_bridging_5 (revision: 1.15) BRANCH_bridging_6 (branch: 1.15.24) BRANCH_LJ3D (branch: 1.15.22) ROOT_BRANCH_LJ3D (revision: 1.15) END_BRANCH_3DBS (revision: 1.15) END_BRANCH_BS3D (revision: 1.15) PRE_MERGE_BRANCH_BS3D (revision: 1.15) END_parameter_2 (revision: 1.15.4.5) BRANCH_parameter_3 (branch: 1.15.20) END_jzimmer_1 (revision: 1.15) PRE_MERGE_jzimmer_1 (revision: 1.15) END_penetration_1 (revision: 1.15) BRANCH_penetration_2 (branch: 1.15.18) BRANCH_jzimmer_1 (branch: 1.15.16) BRANCH_3DBS (branch: 1.15.14) BRANCH_penetration_1 (branch: 1.15.8) BRANCH_bridging_5 (branch: 1.15.12) END_bridging_4 (revision: 1.15) BRANCH_bridging_4 (branch: 1.15.10) BRANCH_BS3D (branch: 1.15.6) BRANCH_parameter_2 (branch: 1.15.4) ROOT_parameter_2 (revision: 1.15) END_paklein_3 (revision: 1.12) TAHOE_1_3 (revision: 1.15) BRANCH_solve_1 (branch: 1.15.2) END_bsun_2 (revision: 1.14) PRE_MERGE_bsun_2 (revision: 1.15) BRANCH_bsun_2 (branch: 1.14.8) ROOT_bsun_2 (revision: 1.14) END_bsun_1 (revision: 1.14) END_bridging_3 (revision: 1.14) PRE_MERGE_bridging_3 (revision: 1.14) BRANCH_bridging_3 (branch: 1.14.6) ROOT_bridging_3 (revision: 1.14) FRACTURE_INTERFACE_0_2 (branch: 1.14.4) BRANCH_bsun_1 (branch: 1.14.2) ROOT_bsun_1 (revision: 1.14) END_THK_3 (revision: 1.11) PRE_MERGE_THK_3 (revision: 1.12) BRANCH_cjkimme_1 (branch: 1.12.4) BRANCH_paklein_3 (branch: 1.12.2) BRANCH_THK_3 (branch: 1.11.16) ROOT_THK_3 (revision: 1.11) END_THK_2 (revision: 1.11) PRE_MERGE_THK_2 (revision: 1.11) TAHOE_1_2 (revision: 1.11) END_bridging_2 (revision: 1.11) PRE_MERGE_bridging_2 (revision: 1.11) BRANCH_THK_2 (branch: 1.11.12) ROOT_THK_2 (revision: 1.11) END_THK_1 (revision: 1.11) PRE_MERGE_THK_1 (revision: 1.11) END_bridging_1 (revision: 1.11) END_atom_1 (revision: 1.9.4.1) END_parameter_1 (revision: 1.11) BRANCH_bridging_2 (branch: 1.11.10) ROOT_bridging_2 (revision: 1.11) BRANCH_parameter_1 (branch: 1.11.8) ROOT_parameter_1 (revision: 1.11) TAHOE_1_1_0 (revision: 1.11) BRANCH_THK_1 (branch: 1.11.6) ROOT_THK_1 (revision: 1.11) PRE_MERGE_bridging_1 (revision: 1.11) BRANCH_conveyor_1 (branch: 1.11.4) TAHOE_1_0_1 (revision: 1.11) BRANCH_bridging_1 (branch: 1.11.2) ROOT_bridging_1 (revision: 1.11) TAHOE_1_0_0 (revision: 1.11) PRE_MERGE_atom_1 (revision: 1.9) T011503 (revision: 1.9) T010103 (revision: 1.9) T121502 (revision: 1.9) BRANCH_atom_1 (branch: 1.9.4) ROOT_atom_1 (revision: 1.9) T120102 (revision: 1.9) T111502 (revision: 1.9) PRE_MERGE_paklein_2 (revision: 1.9) END_paklein_2 (revision: 1.9) T110102 (revision: 1.9) ROOT_paklein_2 (revision: 1.9) BRANCH_paklein_2 (branch: 1.9.2) PRE_MERGE_paklein_1 (revision: 1.8) END_paklein_1 (revision: 1.8.4.2) BRANCH_SIERRA_1 (branch: 1.8.6) BRANCH_paklein_1 (branch: 1.8.4) ROOT_paklein_1 (revision: 1.8) T101502 (revision: 1.8) T100102 (revision: 1.8) PRE_MERGE_B_1 (revision: 1.8) BRANCH_B_1 (branch: 1.8.2) ROOT_B_1 (revision: 1.8) T091502 (revision: 1.8) T090102 (revision: 1.7) T081502 (revision: 1.7) T080102 (revision: 1.7) T071502 (revision: 1.7) PRE_MERGE_name_1 (branch: 1.6.4) T070102 (revision: 1.6) BRANCH_name_1 (branch: 1.6.2) T061502 (revision: 1.6) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5.2.3) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.2) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.4) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2.2.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-07 15:53:16
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Monday November 7, 2005 @ 7:53 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10651 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> PenaltyWallT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h> Log Message: adding friction, but currently commented out =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.14 Mon Nov 7 15:53:09 2005 Repository revision: 1.14 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyWallT.h Status: Needs Checkout Working revision: 1.11 Mon Nov 7 15:53:09 2005 Repository revision: 1.11 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h,v Existing Tags: END_BRANCH_david_5 (revision: 1.10) PREMERGE_BRANCH_david_5 (revision: 1.10) BRANCH_david_5 (branch: 1.10.32) END_david_spatial_2 (revision: 1.10) BRANCH_david_spatial_3 (branch: 1.10.30) END_BRANCH_david_4 (revision: 1.10) BRANCH_david_4_merge (branch: 1.10.28) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.26) BRANCH_Surf (branch: 1.10.24) BRANCH_Surface (branch: 1.10.22) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.20) BRANCH_david_spatial (branch: 1.10.18) BRANCH_david_4 (branch: 1.10.16) END_BRANCH_david_3 (revision: 1.10) PRE_MERGE_branch_david_3 (revision: 1.10) BRANCH_david_3_premerge (branch: 1.10.14) BRANCH_force_1 (branch: 1.10.12) BRANCH_david_3 (branch: 1.10.10) END_BRANCH_david_2 (revision: 1.10) PRE_MERGE_BRANCH_david_2 (revision: 1.10) BRANCH_david_2_merge (branch: 1.10.8) BRANCH_spatial_1 (branch: 1.10.6) BRANCH_david_2 (branch: 1.10.4) PRE_MERGE_david_1 (revision: 1.10) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.38) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.36) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.34) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.32) BRANCH_LJ3D (branch: 1.9.30) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.12.2) BRANCH_parameter_3 (branch: 1.9.28) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.26) BRANCH_jzimmer_1 (branch: 1.9.24) BRANCH_3DBS (branch: 1.9.22) BRANCH_penetration_1 (branch: 1.9.16) BRANCH_bridging_5 (branch: 1.9.20) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.18) BRANCH_BS3D (branch: 1.9.14) BRANCH_parameter_2 (branch: 1.9.12) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.8) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.9.10) END_bsun_2 (revision: 1.9) PRE_MERGE_bsun_2 (revision: 1.9) BRANCH_bsun_2 (branch: 1.9.8) ROOT_bsun_2 (revision: 1.9) END_bsun_1 (revision: 1.9) END_bridging_3 (revision: 1.9) PRE_MERGE_bridging_3 (revision: 1.9) BRANCH_bridging_3 (branch: 1.9.6) ROOT_bridging_3 (revision: 1.9) FRACTURE_INTERFACE_0_2 (branch: 1.9.4) BRANCH_bsun_1 (branch: 1.9.2) ROOT_bsun_1 (revision: 1.9) END_THK_3 (revision: 1.7) PRE_MERGE_THK_3 (revision: 1.8) BRANCH_cjkimme_1 (branch: 1.8.4) BRANCH_paklein_3 (branch: 1.8.2) BRANCH_THK_3 (branch: 1.7.18) ROOT_THK_3 (revision: 1.7) END_THK_2 (revision: 1.7) PRE_MERGE_THK_2 (revision: 1.7) TAHOE_1_2 (revision: 1.7) END_bridging_2 (revision: 1.7) PRE_MERGE_bridging_2 (revision: 1.7) BRANCH_THK_2 (branch: 1.7.14) ROOT_THK_2 (revision: 1.7) END_THK_1 (revision: 1.7) PRE_MERGE_THK_1 (revision: 1.7) END_bridging_1 (revision: 1.7) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.7) BRANCH_bridging_2 (branch: 1.7.12) ROOT_bridging_2 (revision: 1.7) BRANCH_parameter_1 (branch: 1.7.10) ROOT_parameter_1 (revision: 1.7) TAHOE_1_1_0 (revision: 1.7) BRANCH_THK_1 (branch: 1.7.8) ROOT_THK_1 (revision: 1.7) PRE_MERGE_bridging_1 (revision: 1.7) BRANCH_conveyor_1 (branch: 1.7.6) TAHOE_1_0_1 (revision: 1.7) BRANCH_bridging_1 (branch: 1.7.4) ROOT_bridging_1 (revision: 1.7) TAHOE_1_0_0 (revision: 1.7) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.6) END_paklein_2 (revision: 1.6) T110102 (revision: 1.6) ROOT_paklein_2 (revision: 1.6) BRANCH_paklein_2 (branch: 1.6.8) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.6) T081502 (revision: 1.6) T080102 (revision: 1.6) T071502 (revision: 1.6) PRE_MERGE_name_1 (branch: 1.5.4) T070102 (revision: 1.5) BRANCH_name_1 (branch: 1.5.2) T061502 (revision: 1.5) PRE_MERG_field_1 (revision: 1.4) END_field_1 (revision: 1.4.4.1) T060102 (revision: 1.4) T051502 (revision: 1.4) T050102 (revision: 1.4) BRANCH_field_1 (branch: 1.4.4) ROOT_field_1 (revision: 1.4) T041502 (revision: 1.4) T040102 (revision: 1.4) T031502 (revision: 1.4) T030102 (revision: 1.4) T021502 (revision: 1.4) T020102 (revision: 1.4) T011502 (revision: 1.4) T010102 (revision: 1.4) PRE_MERGE_model_1 (revision: 1.4) END_model_1 (revision: 1.4) T121501 (revision: 1.4) T120101 (revision: 1.4) T111501 (revision: 1.4) T110101 (revision: 1.4) T101501 (revision: 1.4) T100101 (revision: 1.4) BRANCH_model_1 (branch: 1.4.2) ROOT_model_1 (revision: 1.4) T091501 (revision: 1.4) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-07 21:00:34
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Monday November 7, 2005 @ 13:00 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6235 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> PenaltyWallT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h> Log Message: friction turned off if coefficient = 0 =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.15 Mon Nov 7 21:00:23 2005 Repository revision: 1.15 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyWallT.h Status: Needs Checkout Working revision: 1.12 Mon Nov 7 21:00:23 2005 Repository revision: 1.12 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h,v Existing Tags: END_BRANCH_david_5 (revision: 1.10) PREMERGE_BRANCH_david_5 (revision: 1.10) BRANCH_david_5 (branch: 1.10.32) END_david_spatial_2 (revision: 1.10) BRANCH_david_spatial_3 (branch: 1.10.30) END_BRANCH_david_4 (revision: 1.10) BRANCH_david_4_merge (branch: 1.10.28) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.26) BRANCH_Surf (branch: 1.10.24) BRANCH_Surface (branch: 1.10.22) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.20) BRANCH_david_spatial (branch: 1.10.18) BRANCH_david_4 (branch: 1.10.16) END_BRANCH_david_3 (revision: 1.10) PRE_MERGE_branch_david_3 (revision: 1.10) BRANCH_david_3_premerge (branch: 1.10.14) BRANCH_force_1 (branch: 1.10.12) BRANCH_david_3 (branch: 1.10.10) END_BRANCH_david_2 (revision: 1.10) PRE_MERGE_BRANCH_david_2 (revision: 1.10) BRANCH_david_2_merge (branch: 1.10.8) BRANCH_spatial_1 (branch: 1.10.6) BRANCH_david_2 (branch: 1.10.4) PRE_MERGE_david_1 (revision: 1.10) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.38) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.36) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.34) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.32) BRANCH_LJ3D (branch: 1.9.30) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.12.2) BRANCH_parameter_3 (branch: 1.9.28) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.26) BRANCH_jzimmer_1 (branch: 1.9.24) BRANCH_3DBS (branch: 1.9.22) BRANCH_penetration_1 (branch: 1.9.16) BRANCH_bridging_5 (branch: 1.9.20) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.18) BRANCH_BS3D (branch: 1.9.14) BRANCH_parameter_2 (branch: 1.9.12) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.8) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.9.10) END_bsun_2 (revision: 1.9) PRE_MERGE_bsun_2 (revision: 1.9) BRANCH_bsun_2 (branch: 1.9.8) ROOT_bsun_2 (revision: 1.9) END_bsun_1 (revision: 1.9) END_bridging_3 (revision: 1.9) PRE_MERGE_bridging_3 (revision: 1.9) BRANCH_bridging_3 (branch: 1.9.6) ROOT_bridging_3 (revision: 1.9) FRACTURE_INTERFACE_0_2 (branch: 1.9.4) BRANCH_bsun_1 (branch: 1.9.2) ROOT_bsun_1 (revision: 1.9) END_THK_3 (revision: 1.7) PRE_MERGE_THK_3 (revision: 1.8) BRANCH_cjkimme_1 (branch: 1.8.4) BRANCH_paklein_3 (branch: 1.8.2) BRANCH_THK_3 (branch: 1.7.18) ROOT_THK_3 (revision: 1.7) END_THK_2 (revision: 1.7) PRE_MERGE_THK_2 (revision: 1.7) TAHOE_1_2 (revision: 1.7) END_bridging_2 (revision: 1.7) PRE_MERGE_bridging_2 (revision: 1.7) BRANCH_THK_2 (branch: 1.7.14) ROOT_THK_2 (revision: 1.7) END_THK_1 (revision: 1.7) PRE_MERGE_THK_1 (revision: 1.7) END_bridging_1 (revision: 1.7) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.7) BRANCH_bridging_2 (branch: 1.7.12) ROOT_bridging_2 (revision: 1.7) BRANCH_parameter_1 (branch: 1.7.10) ROOT_parameter_1 (revision: 1.7) TAHOE_1_1_0 (revision: 1.7) BRANCH_THK_1 (branch: 1.7.8) ROOT_THK_1 (revision: 1.7) PRE_MERGE_bridging_1 (revision: 1.7) BRANCH_conveyor_1 (branch: 1.7.6) TAHOE_1_0_1 (revision: 1.7) BRANCH_bridging_1 (branch: 1.7.4) ROOT_bridging_1 (revision: 1.7) TAHOE_1_0_0 (revision: 1.7) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.6) END_paklein_2 (revision: 1.6) T110102 (revision: 1.6) ROOT_paklein_2 (revision: 1.6) BRANCH_paklein_2 (branch: 1.6.8) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.6) T081502 (revision: 1.6) T080102 (revision: 1.6) T071502 (revision: 1.6) PRE_MERGE_name_1 (branch: 1.5.4) T070102 (revision: 1.5) BRANCH_name_1 (branch: 1.5.2) T061502 (revision: 1.5) PRE_MERG_field_1 (revision: 1.4) END_field_1 (revision: 1.4.4.1) T060102 (revision: 1.4) T051502 (revision: 1.4) T050102 (revision: 1.4) BRANCH_field_1 (branch: 1.4.4) ROOT_field_1 (revision: 1.4) T041502 (revision: 1.4) T040102 (revision: 1.4) T031502 (revision: 1.4) T030102 (revision: 1.4) T021502 (revision: 1.4) T020102 (revision: 1.4) T011502 (revision: 1.4) T010102 (revision: 1.4) PRE_MERGE_model_1 (revision: 1.4) END_model_1 (revision: 1.4) T121501 (revision: 1.4) T120101 (revision: 1.4) T111501 (revision: 1.4) T110101 (revision: 1.4) T101501 (revision: 1.4) T100101 (revision: 1.4) BRANCH_model_1 (branch: 1.4.2) ROOT_model_1 (revision: 1.4) T091501 (revision: 1.4) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-10 17:39:57
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Thursday November 10, 2005 @ 9:39 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28509 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: add input for wall_tangent for calculating tangential force due to friction =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.16 Thu Nov 10 17:39:50 2005 Repository revision: 1.16 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-10 20:16:42
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Thursday November 10, 2005 @ 12:16 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8495 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: corrected sign on frictional force =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.17 Thu Nov 10 20:16:33 2005 Repository revision: 1.17 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-20 23:08:35
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Sunday November 20, 2005 @ 15:08 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5462 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> PenaltyWallT.h: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h> Log Message: changes to calculate current tangential displacements calculate fxyforce using normal and tangential displacements at contact nodes =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.18 Sun Nov 20 23:08:29 2005 Repository revision: 1.18 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file PenaltyWallT.h Status: Needs Checkout Working revision: 1.13 Sun Nov 20 23:08:29 2005 Repository revision: 1.13 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.h,v Existing Tags: END_BRANCH_david_5 (revision: 1.10) PREMERGE_BRANCH_david_5 (revision: 1.10) BRANCH_david_5 (branch: 1.10.32) END_david_spatial_2 (revision: 1.10) BRANCH_david_spatial_3 (branch: 1.10.30) END_BRANCH_david_4 (revision: 1.10) BRANCH_david_4_merge (branch: 1.10.28) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.26) BRANCH_Surf (branch: 1.10.24) BRANCH_Surface (branch: 1.10.22) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.20) BRANCH_david_spatial (branch: 1.10.18) BRANCH_david_4 (branch: 1.10.16) END_BRANCH_david_3 (revision: 1.10) PRE_MERGE_branch_david_3 (revision: 1.10) BRANCH_david_3_premerge (branch: 1.10.14) BRANCH_force_1 (branch: 1.10.12) BRANCH_david_3 (branch: 1.10.10) END_BRANCH_david_2 (revision: 1.10) PRE_MERGE_BRANCH_david_2 (revision: 1.10) BRANCH_david_2_merge (branch: 1.10.8) BRANCH_spatial_1 (branch: 1.10.6) BRANCH_david_2 (branch: 1.10.4) PRE_MERGE_david_1 (revision: 1.10) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.38) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.36) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.34) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.32) BRANCH_LJ3D (branch: 1.9.30) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.12.2) BRANCH_parameter_3 (branch: 1.9.28) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.26) BRANCH_jzimmer_1 (branch: 1.9.24) BRANCH_3DBS (branch: 1.9.22) BRANCH_penetration_1 (branch: 1.9.16) BRANCH_bridging_5 (branch: 1.9.20) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.18) BRANCH_BS3D (branch: 1.9.14) BRANCH_parameter_2 (branch: 1.9.12) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.8) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.9.10) END_bsun_2 (revision: 1.9) PRE_MERGE_bsun_2 (revision: 1.9) BRANCH_bsun_2 (branch: 1.9.8) ROOT_bsun_2 (revision: 1.9) END_bsun_1 (revision: 1.9) END_bridging_3 (revision: 1.9) PRE_MERGE_bridging_3 (revision: 1.9) BRANCH_bridging_3 (branch: 1.9.6) ROOT_bridging_3 (revision: 1.9) FRACTURE_INTERFACE_0_2 (branch: 1.9.4) BRANCH_bsun_1 (branch: 1.9.2) ROOT_bsun_1 (revision: 1.9) END_THK_3 (revision: 1.7) PRE_MERGE_THK_3 (revision: 1.8) BRANCH_cjkimme_1 (branch: 1.8.4) BRANCH_paklein_3 (branch: 1.8.2) BRANCH_THK_3 (branch: 1.7.18) ROOT_THK_3 (revision: 1.7) END_THK_2 (revision: 1.7) PRE_MERGE_THK_2 (revision: 1.7) TAHOE_1_2 (revision: 1.7) END_bridging_2 (revision: 1.7) PRE_MERGE_bridging_2 (revision: 1.7) BRANCH_THK_2 (branch: 1.7.14) ROOT_THK_2 (revision: 1.7) END_THK_1 (revision: 1.7) PRE_MERGE_THK_1 (revision: 1.7) END_bridging_1 (revision: 1.7) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.7) BRANCH_bridging_2 (branch: 1.7.12) ROOT_bridging_2 (revision: 1.7) BRANCH_parameter_1 (branch: 1.7.10) ROOT_parameter_1 (revision: 1.7) TAHOE_1_1_0 (revision: 1.7) BRANCH_THK_1 (branch: 1.7.8) ROOT_THK_1 (revision: 1.7) PRE_MERGE_bridging_1 (revision: 1.7) BRANCH_conveyor_1 (branch: 1.7.6) TAHOE_1_0_1 (revision: 1.7) BRANCH_bridging_1 (branch: 1.7.4) ROOT_bridging_1 (revision: 1.7) TAHOE_1_0_0 (revision: 1.7) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.6) END_paklein_2 (revision: 1.6) T110102 (revision: 1.6) ROOT_paklein_2 (revision: 1.6) BRANCH_paklein_2 (branch: 1.6.8) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.6) T081502 (revision: 1.6) T080102 (revision: 1.6) T071502 (revision: 1.6) PRE_MERGE_name_1 (branch: 1.5.4) T070102 (revision: 1.5) BRANCH_name_1 (branch: 1.5.2) T061502 (revision: 1.5) PRE_MERG_field_1 (revision: 1.4) END_field_1 (revision: 1.4.4.1) T060102 (revision: 1.4) T051502 (revision: 1.4) T050102 (revision: 1.4) BRANCH_field_1 (branch: 1.4.4) ROOT_field_1 (revision: 1.4) T041502 (revision: 1.4) T040102 (revision: 1.4) T031502 (revision: 1.4) T030102 (revision: 1.4) T021502 (revision: 1.4) T020102 (revision: 1.4) T011502 (revision: 1.4) T010102 (revision: 1.4) PRE_MERGE_model_1 (revision: 1.4) END_model_1 (revision: 1.4) T121501 (revision: 1.4) T120101 (revision: 1.4) T111501 (revision: 1.4) T110101 (revision: 1.4) T101501 (revision: 1.4) T100101 (revision: 1.4) BRANCH_model_1 (branch: 1.4.2) ROOT_model_1 (revision: 1.4) T091501 (revision: 1.4) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-20 23:19:22
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Sunday November 20, 2005 @ 15:19 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9214 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: use the initial coordinates of the contact nodes of the time step to calculate slip and tangential frictional force =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.19 Sun Nov 20 23:19:16 2005 Repository revision: 1.19 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-11-30 20:51:33
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Wednesday November 30, 2005 @ 12:51 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29810 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: fix magnitude check for tangent vector in order to convert to unit vector =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.20 Wed Nov 30 20:51:27 2005 Repository revision: 1.20 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: Regueiro <reg...@us...> - 2005-12-01 00:24:19
|
$Id: log.pl,v 1.7 2005/06/18 15:53:23 paklein Exp $ =================================================================== Date: Wednesday November 30, 2005 @ 16:24 Author: reg...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19773 Modified Files: PenaltyWallT.cpp: <http://cvs.sourceforge.net/viewcvs.py/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp> Log Message: modified tolerance for checking whether to convert tangent vector to a unit vector =================================================================== File: no file PenaltyWallT.cpp Status: Needs Checkout Working revision: 1.21 Thu Dec 1 00:24:11 2005 Repository revision: 1.21 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PenaltyWallT.cpp,v Existing Tags: END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.32) END_david_spatial_2 (revision: 1.13.20.1) BRANCH_david_spatial_3 (branch: 1.13.30) END_BRANCH_david_4 (revision: 1.13) BRANCH_david_4_merge (branch: 1.13.28) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.26) BRANCH_Surf (branch: 1.13.24) BRANCH_Surface (branch: 1.13.22) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.20) BRANCH_david_spatial (branch: 1.13.18) BRANCH_david_4 (branch: 1.13.16) END_BRANCH_david_3 (revision: 1.13) PRE_MERGE_branch_david_3 (revision: 1.13) BRANCH_david_3_premerge (branch: 1.13.14) BRANCH_force_1 (branch: 1.13.12) BRANCH_david_3 (branch: 1.13.10) END_BRANCH_david_2 (revision: 1.13) PRE_MERGE_BRANCH_david_2 (revision: 1.13) BRANCH_david_2_merge (branch: 1.13.8) BRANCH_spatial_1 (branch: 1.13.6) BRANCH_david_2 (branch: 1.13.4) PRE_MERGE_david_1 (revision: 1.13) TAHOE_2_1 (revision: 1.13) BRANCH_david_1 (branch: 1.13.2) TAHOE_2_0 (revision: 1.13) TAHOE_1_X (branch: 1.12.4) TAHOE_1_4 (revision: 1.12) BRANCH_parameter_4 (branch: 1.12.2) END_BRANCH_LJ3D (revision: 1.11.30.1) PRE_MERGE_BRANCH_LJ3D (revision: 1.12) END_penetration_2 (revision: 1.11) PRE_MERGE_penetration_2 (revision: 1.12) END_bridging_6 (revision: 1.11) PRE_MERGE_bridging_6 (revision: 1.12) ROOT_BRANCH_NN (revision: 1.11) BRANCH_NN (branch: 1.11.34) END_bridging_5 (revision: 1.11) BRANCH_bridging_6 (branch: 1.11.32) BRANCH_LJ3D (branch: 1.11.30) ROOT_BRANCH_LJ3D (revision: 1.11) END_BRANCH_3DBS (revision: 1.11) END_BRANCH_BS3D (revision: 1.11) PRE_MERGE_BRANCH_BS3D (revision: 1.11) END_parameter_2 (revision: 1.11.12.3) BRANCH_parameter_3 (branch: 1.11.28) END_jzimmer_1 (revision: 1.11) PRE_MERGE_jzimmer_1 (revision: 1.11) END_penetration_1 (revision: 1.11) BRANCH_penetration_2 (branch: 1.11.26) BRANCH_jzimmer_1 (branch: 1.11.24) BRANCH_3DBS (branch: 1.11.22) BRANCH_penetration_1 (branch: 1.11.16) BRANCH_bridging_5 (branch: 1.11.20) END_bridging_4 (revision: 1.11) BRANCH_bridging_4 (branch: 1.11.18) BRANCH_BS3D (branch: 1.11.14) BRANCH_parameter_2 (branch: 1.11.12) ROOT_parameter_2 (revision: 1.11) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.11) BRANCH_solve_1 (branch: 1.11.10) END_bsun_2 (revision: 1.11) PRE_MERGE_bsun_2 (revision: 1.11) BRANCH_bsun_2 (branch: 1.11.8) ROOT_bsun_2 (revision: 1.11) END_bsun_1 (revision: 1.11) END_bridging_3 (revision: 1.11) PRE_MERGE_bridging_3 (revision: 1.11) BRANCH_bridging_3 (branch: 1.11.6) ROOT_bridging_3 (revision: 1.11) FRACTURE_INTERFACE_0_2 (branch: 1.11.4) BRANCH_bsun_1 (branch: 1.11.2) ROOT_bsun_1 (revision: 1.11) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.10) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.16) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.12) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.9) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.9) END_atom_1 (revision: 1.8) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.10) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.8) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.9.6) ROOT_THK_1 (revision: 1.9) PRE_MERGE_bridging_1 (revision: 1.9) BRANCH_conveyor_1 (branch: 1.9.4) TAHOE_1_0_1 (revision: 1.9) BRANCH_bridging_1 (branch: 1.9.2) ROOT_bridging_1 (revision: 1.9) TAHOE_1_0_0 (revision: 1.9) PRE_MERGE_atom_1 (revision: 1.8) T011503 (revision: 1.8) T010103 (revision: 1.8) T121502 (revision: 1.8) BRANCH_atom_1 (branch: 1.8.2) ROOT_atom_1 (revision: 1.8) T120102 (revision: 1.8) T111502 (revision: 1.7) PRE_MERGE_paklein_2 (revision: 1.7) END_paklein_2 (revision: 1.7) T110102 (revision: 1.7) ROOT_paklein_2 (revision: 1.7) BRANCH_paklein_2 (branch: 1.7.2) PRE_MERGE_paklein_1 (revision: 1.6) END_paklein_1 (revision: 1.6.4.2) BRANCH_SIERRA_1 (branch: 1.6.6) BRANCH_paklein_1 (branch: 1.6.4) ROOT_paklein_1 (revision: 1.6) T101502 (revision: 1.6) T100102 (revision: 1.6) PRE_MERGE_B_1 (revision: 1.6) BRANCH_B_1 (branch: 1.6.2) ROOT_B_1 (revision: 1.6) T091502 (revision: 1.6) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.4.4) T070102 (revision: 1.4) BRANCH_name_1 (branch: 1.4.2) T061502 (revision: 1.4) PRE_MERG_field_1 (revision: 1.3) END_field_1 (revision: 1.3.4.1) T060102 (revision: 1.3) T051502 (revision: 1.3) T050102 (revision: 1.3) BRANCH_field_1 (branch: 1.3.4) ROOT_field_1 (revision: 1.3) T041502 (revision: 1.3) T040102 (revision: 1.3) T031502 (revision: 1.3) T030102 (revision: 1.3) T021502 (revision: 1.3) T020102 (revision: 1.3) T011502 (revision: 1.3) T010102 (revision: 1.3) PRE_MERGE_model_1 (revision: 1.3) END_model_1 (revision: 1.3) T121501 (revision: 1.3) T120101 (revision: 1.3) T111501 (revision: 1.3) T110101 (revision: 1.3) T101501 (revision: 1.3) T100101 (revision: 1.3) BRANCH_model_1 (branch: 1.3.2) ROOT_model_1 (revision: 1.3) T091501 (revision: 1.3) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: R-J <r-...@us...> - 2006-06-19 15:25:36
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Monday June 19, 2006 @ 8:25 Author: r-...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22472/tahoe/src/nodes/FBC_controllers Modified Files: FBC_ControllerT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.cpp> FBC_ControllerT.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h> makefile: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/makefile> Added Files: PressureBCT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp> PressureBCT.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h> Log Message: added a pressure bc - 3D only for now. small additions were made to nArray2DT.h & DomainIntegrationT.h =================================================================== File: no file PressureBCT.cpp Status: Needs Checkout Working revision: 1.1 Mon Jun 19 15:25:34 2006 Repository revision: 1.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp,v Existing Tags: No Tags Exist =================================================================== File: no file PressureBCT.h Status: Needs Checkout Working revision: 1.1 Mon Jun 19 15:25:34 2006 Repository revision: 1.1 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h,v Existing Tags: No Tags Exist =================================================================== File: no file FBC_ControllerT.cpp Status: Needs Checkout Working revision: 1.14 Mon Jun 19 15:25:34 2006 Repository revision: 1.14 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.cpp,v Existing Tags: BRANCH_david_6 (branch: 1.13.18) END_BRANCH_david_5 (revision: 1.13) PREMERGE_BRANCH_david_5 (revision: 1.13) BRANCH_david_5 (branch: 1.13.16) END_david_spatial_2 (revision: 1.13) BRANCH_david_spatial_3 (branch: 1.13.14) END_BRANCH_david_4 (revision: 1.12) BRANCH_david_4_merge (branch: 1.13.12) PRE_MERGE_branch_david_4 (revision: 1.13) BRANCH_david_4_premerge (branch: 1.13.10) BRANCH_Surf (branch: 1.13.8) BRANCH_Surface (branch: 1.13.6) END_david_spatial (revision: 1.13) BRANCH_david_spatial_2 (branch: 1.13.4) BRANCH_david_spatial (branch: 1.13.2) BRANCH_david_4 (branch: 1.12.14) END_BRANCH_david_3 (revision: 1.12) PRE_MERGE_branch_david_3 (revision: 1.12) BRANCH_david_3_premerge (branch: 1.12.12) BRANCH_force_1 (branch: 1.12.10) BRANCH_david_3 (branch: 1.12.8) END_BRANCH_david_2 (revision: 1.12) PRE_MERGE_BRANCH_david_2 (revision: 1.12) BRANCH_david_2_merge (branch: 1.12.6) BRANCH_spatial_1 (branch: 1.12.4) BRANCH_david_2 (branch: 1.12.2) PRE_MERGE_david_1 (revision: 1.12) TAHOE_2_1 (revision: 1.10) BRANCH_david_1 (branch: 1.10.2) TAHOE_2_0 (revision: 1.10) TAHOE_1_X (branch: 1.9.32) TAHOE_1_4 (revision: 1.9) BRANCH_parameter_4 (branch: 1.9.30) END_BRANCH_LJ3D (revision: 1.9) PRE_MERGE_BRANCH_LJ3D (revision: 1.9) END_penetration_2 (revision: 1.9) PRE_MERGE_penetration_2 (revision: 1.9) END_bridging_6 (revision: 1.9) PRE_MERGE_bridging_6 (revision: 1.9) ROOT_BRANCH_NN (revision: 1.9) BRANCH_NN (branch: 1.9.28) END_bridging_5 (revision: 1.9) BRANCH_bridging_6 (branch: 1.9.26) BRANCH_LJ3D (branch: 1.9.24) ROOT_BRANCH_LJ3D (revision: 1.9) END_BRANCH_3DBS (revision: 1.9) END_BRANCH_BS3D (revision: 1.9) PRE_MERGE_BRANCH_BS3D (revision: 1.9) END_parameter_2 (revision: 1.9.6.3) BRANCH_parameter_3 (branch: 1.9.22) END_jzimmer_1 (revision: 1.9) PRE_MERGE_jzimmer_1 (revision: 1.9) END_penetration_1 (revision: 1.9) BRANCH_penetration_2 (branch: 1.9.20) BRANCH_jzimmer_1 (branch: 1.9.18) BRANCH_3DBS (branch: 1.9.16) BRANCH_penetration_1 (branch: 1.9.10) BRANCH_bridging_5 (branch: 1.9.14) END_bridging_4 (revision: 1.9) BRANCH_bridging_4 (branch: 1.9.12) BRANCH_BS3D (branch: 1.9.8) BRANCH_parameter_2 (branch: 1.9.6) ROOT_parameter_2 (revision: 1.9) END_paklein_3 (revision: 1.7) TAHOE_1_3 (revision: 1.9) BRANCH_solve_1 (branch: 1.9.4) END_bsun_2 (revision: 1.9) PRE_MERGE_bsun_2 (revision: 1.9) BRANCH_bsun_2 (branch: 1.9.2) ROOT_bsun_2 (revision: 1.9) END_bsun_1 (revision: 1.7.6.1) END_bridging_3 (revision: 1.7.10.1) PRE_MERGE_bridging_3 (revision: 1.7) BRANCH_bridging_3 (branch: 1.7.10) ROOT_bridging_3 (revision: 1.7) FRACTURE_INTERFACE_0_2 (branch: 1.7.8) BRANCH_bsun_1 (branch: 1.7.6) ROOT_bsun_1 (revision: 1.7) END_THK_3 (revision: 1.6) PRE_MERGE_THK_3 (revision: 1.7) BRANCH_cjkimme_1 (branch: 1.7.4) BRANCH_paklein_3 (branch: 1.7.2) BRANCH_THK_3 (branch: 1.6.10) ROOT_THK_3 (revision: 1.6) END_THK_2 (revision: 1.6) PRE_MERGE_THK_2 (revision: 1.6) TAHOE_1_2 (revision: 1.6) END_bridging_2 (revision: 1.6) PRE_MERGE_bridging_2 (revision: 1.6) BRANCH_THK_2 (branch: 1.6.6) ROOT_THK_2 (revision: 1.6) END_THK_1 (revision: 1.5) PRE_MERGE_THK_1 (revision: 1.6) END_bridging_1 (revision: 1.4.2.2) END_atom_1 (revision: 1.3) END_parameter_1 (revision: 1.6) BRANCH_bridging_2 (branch: 1.6.4) ROOT_bridging_2 (revision: 1.6) BRANCH_parameter_1 (branch: 1.6.2) ROOT_parameter_1 (revision: 1.6) TAHOE_1_1_0 (revision: 1.6) BRANCH_THK_1 (branch: 1.5.2) ROOT_THK_1 (revision: 1.5) PRE_MERGE_bridging_1 (revision: 1.4) BRANCH_conveyor_1 (branch: 1.4.4) TAHOE_1_0_1 (revision: 1.4) BRANCH_bridging_1 (branch: 1.4.2) ROOT_bridging_1 (revision: 1.4) TAHOE_1_0_0 (revision: 1.4) PRE_MERGE_atom_1 (revision: 1.3) T011503 (revision: 1.3) T010103 (revision: 1.3) T121502 (revision: 1.3) BRANCH_atom_1 (branch: 1.3.10) ROOT_atom_1 (revision: 1.3) T120102 (revision: 1.3) T111502 (revision: 1.3) PRE_MERGE_paklein_2 (revision: 1.3) END_paklein_2 (revision: 1.3) T110102 (revision: 1.3) ROOT_paklein_2 (revision: 1.3) BRANCH_paklein_2 (branch: 1.3.8) PRE_MERGE_paklein_1 (revision: 1.3) END_paklein_1 (revision: 1.3) BRANCH_SIERRA_1 (branch: 1.3.6) BRANCH_paklein_1 (branch: 1.3.4) ROOT_paklein_1 (revision: 1.3) T101502 (revision: 1.3) T100102 (revision: 1.3) PRE_MERGE_B_1 (revision: 1.3) BRANCH_B_1 (branch: 1.3.2) ROOT_B_1 (revision: 1.3) T091502 (revision: 1.3) T090102 (revision: 1.3) T081502 (revision: 1.3) T080102 (revision: 1.3) T071502 (revision: 1.3) PRE_MERGE_name_1 (branch: 1.2.4) T070102 (revision: 1.2) BRANCH_name_1 (branch: 1.2.2) T061502 (revision: 1.2) PRE_MERG_field_1 (revision: 1.1.1.1) END_field_1 (revision: 1.1.1.1.8.2) T060102 (revision: 1.1.1.1) T051502 (revision: 1.1.1.1) T050102 (revision: 1.1.1.1) BRANCH_field_1 (branch: 1.1.1.1.8) ROOT_field_1 (revision: 1.1.1.1) T041502 (revision: 1.1.1.1) T040102 (revision: 1.1.1.1) T031502 (revision: 1.1.1.1) T030102 (revision: 1.1.1.1) T021502 (revision: 1.1.1.1) T020102 (revision: 1.1.1.1) T011502 (revision: 1.1.1.1) T010102 (revision: 1.1.1.1) PRE_MERGE_model_1 (revision: 1.1.1.1) END_model_1 (revision: 1.1.1.1) T121501 (revision: 1.1.1.1) T120101 (revision: 1.1.1.1) T111501 (revision: 1.1.1.1) T110101 (revision: 1.1.1.1) T101501 (revision: 1.1.1.1) T100101 (revision: 1.1.1.1) BRANCH_model_1 (branch: 1.1.1.1.6) ROOT_model_1 (revision: 1.1.1.1) T091501 (revision: 1.1.1.1) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file FBC_ControllerT.h Status: Needs Checkout Working revision: 1.18 Mon Jun 19 15:25:34 2006 Repository revision: 1.18 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/FBC_ControllerT.h,v Existing Tags: BRANCH_david_6 (branch: 1.17.18) END_BRANCH_david_5 (revision: 1.17) PREMERGE_BRANCH_david_5 (revision: 1.17) BRANCH_david_5 (branch: 1.17.16) END_david_spatial_2 (revision: 1.17.4.1) BRANCH_david_spatial_3 (branch: 1.17.14) END_BRANCH_david_4 (revision: 1.16) BRANCH_david_4_merge (branch: 1.17.12) PRE_MERGE_branch_david_4 (revision: 1.17) BRANCH_david_4_premerge (branch: 1.17.10) BRANCH_Surf (branch: 1.17.8) BRANCH_Surface (branch: 1.17.6) END_david_spatial (revision: 1.17) BRANCH_david_spatial_2 (branch: 1.17.4) BRANCH_david_spatial (branch: 1.17.2) BRANCH_david_4 (branch: 1.16.14) END_BRANCH_david_3 (revision: 1.16) PRE_MERGE_branch_david_3 (revision: 1.16) BRANCH_david_3_premerge (branch: 1.16.12) BRANCH_force_1 (branch: 1.16.10) BRANCH_david_3 (branch: 1.16.8) END_BRANCH_david_2 (revision: 1.16) PRE_MERGE_BRANCH_david_2 (revision: 1.16) BRANCH_david_2_merge (branch: 1.16.6) BRANCH_spatial_1 (branch: 1.16.4) BRANCH_david_2 (branch: 1.16.2) PRE_MERGE_david_1 (revision: 1.16) TAHOE_2_1 (revision: 1.14) BRANCH_david_1 (branch: 1.14.2) TAHOE_2_0 (revision: 1.14) TAHOE_1_X (branch: 1.13.6) TAHOE_1_4 (revision: 1.13) BRANCH_parameter_4 (branch: 1.13.4) END_BRANCH_LJ3D (revision: 1.12) PRE_MERGE_BRANCH_LJ3D (revision: 1.13) END_penetration_2 (revision: 1.12) PRE_MERGE_penetration_2 (revision: 1.13) END_bridging_6 (revision: 1.12) PRE_MERGE_bridging_6 (revision: 1.13) ROOT_BRANCH_NN (revision: 1.13) BRANCH_NN (branch: 1.13.2) END_bridging_5 (revision: 1.12) BRANCH_bridging_6 (branch: 1.12.32) BRANCH_LJ3D (branch: 1.12.30) ROOT_BRANCH_LJ3D (revision: 1.12) END_BRANCH_3DBS (revision: 1.12) END_BRANCH_BS3D (revision: 1.12) PRE_MERGE_BRANCH_BS3D (revision: 1.12) END_parameter_2 (revision: 1.12.12.3) BRANCH_parameter_3 (branch: 1.12.28) END_jzimmer_1 (revision: 1.12) PRE_MERGE_jzimmer_1 (revision: 1.12) END_penetration_1 (revision: 1.12) BRANCH_penetration_2 (branch: 1.12.26) BRANCH_jzimmer_1 (branch: 1.12.24) BRANCH_3DBS (branch: 1.12.22) BRANCH_penetration_1 (branch: 1.12.16) BRANCH_bridging_5 (branch: 1.12.20) END_bridging_4 (revision: 1.12) BRANCH_bridging_4 (branch: 1.12.18) BRANCH_BS3D (branch: 1.12.14) BRANCH_parameter_2 (branch: 1.12.12) ROOT_parameter_2 (revision: 1.12) END_paklein_3 (revision: 1.10) TAHOE_1_3 (revision: 1.12) BRANCH_solve_1 (branch: 1.12.10) END_bsun_2 (revision: 1.12) PRE_MERGE_bsun_2 (revision: 1.12) BRANCH_bsun_2 (branch: 1.12.8) ROOT_bsun_2 (revision: 1.12) END_bsun_1 (revision: 1.12) END_bridging_3 (revision: 1.12) PRE_MERGE_bridging_3 (revision: 1.12) BRANCH_bridging_3 (branch: 1.12.6) ROOT_bridging_3 (revision: 1.12) FRACTURE_INTERFACE_0_2 (branch: 1.12.4) BRANCH_bsun_1 (branch: 1.12.2) ROOT_bsun_1 (revision: 1.12) END_THK_3 (revision: 1.9) PRE_MERGE_THK_3 (revision: 1.11) BRANCH_cjkimme_1 (branch: 1.10.4) BRANCH_paklein_3 (branch: 1.10.2) BRANCH_THK_3 (branch: 1.9.10) ROOT_THK_3 (revision: 1.9) END_THK_2 (revision: 1.9) PRE_MERGE_THK_2 (revision: 1.9) TAHOE_1_2 (revision: 1.9) END_bridging_2 (revision: 1.9) PRE_MERGE_bridging_2 (revision: 1.9) BRANCH_THK_2 (branch: 1.9.6) ROOT_THK_2 (revision: 1.9) END_THK_1 (revision: 1.8) PRE_MERGE_THK_1 (revision: 1.9) END_bridging_1 (revision: 1.8) END_atom_1 (revision: 1.7) END_parameter_1 (revision: 1.9) BRANCH_bridging_2 (branch: 1.9.4) ROOT_bridging_2 (revision: 1.9) BRANCH_parameter_1 (branch: 1.9.2) ROOT_parameter_1 (revision: 1.9) TAHOE_1_1_0 (revision: 1.9) BRANCH_THK_1 (branch: 1.8.6) ROOT_THK_1 (revision: 1.8) PRE_MERGE_bridging_1 (revision: 1.8) BRANCH_conveyor_1 (branch: 1.8.4) TAHOE_1_0_1 (revision: 1.8) BRANCH_bridging_1 (branch: 1.8.2) ROOT_bridging_1 (revision: 1.8) TAHOE_1_0_0 (revision: 1.8) PRE_MERGE_atom_1 (revision: 1.7) T011503 (revision: 1.7) T010103 (revision: 1.7) T121502 (revision: 1.7) BRANCH_atom_1 (branch: 1.7.2) ROOT_atom_1 (revision: 1.7) T120102 (revision: 1.7) T111502 (revision: 1.6) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5.8.1) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.8) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.6) BRANCH_paklein_1 (branch: 1.5.4) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.2) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.3.4) T070102 (revision: 1.3) BRANCH_name_1 (branch: 1.3.2) T061502 (revision: 1.3) PRE_MERG_field_1 (revision: 1.2) END_field_1 (revision: 1.2.4.3) T060102 (revision: 1.2) T051502 (revision: 1.2) T050102 (revision: 1.2) BRANCH_field_1 (branch: 1.2.4) ROOT_field_1 (revision: 1.2) T041502 (revision: 1.2) T040102 (revision: 1.2) T031502 (revision: 1.2) T030102 (revision: 1.2) T021502 (revision: 1.2) T020102 (revision: 1.2) T011502 (revision: 1.2) T010102 (revision: 1.2) PRE_MERGE_model_1 (revision: 1.2) END_model_1 (revision: 1.2) T121501 (revision: 1.2) T120101 (revision: 1.2) T111501 (revision: 1.2) T110101 (revision: 1.2) T101501 (revision: 1.2) T100101 (revision: 1.2) BRANCH_model_1 (branch: 1.2.2) ROOT_model_1 (revision: 1.2) T091501 (revision: 1.2) T090101 (revision: 1.1.1.1) T081501 (revision: 1.1.1.1) T080101 (revision: 1.1.1.1) T071501 (revision: 1.1.1.1) END_solid_1 (revision: 1.1.1.1) PRE_MERGE_solid_1 (revision: 1.1.1.1) T070101 (revision: 1.1.1.1) END_meshfree_1 (revision: 1.1.1.1) BRANCH_meshfree_1 (branch: 1.1.1.1.4) ROOT_meshfree_1 (revision: 1.1.1.1) T061501 (revision: 1.1.1.1) BRANCH_solid_1 (branch: 1.1.1.1.2) ROOT_solid_1 (revision: 1.1.1.1) T060101 (revision: 1.1.1.1) T051601 (revision: 1.1.1.1) T050101 (revision: 1.1.1.1) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) =================================================================== File: no file makefile Status: Needs Checkout Working revision: 1.12 Mon Jun 19 15:25:34 2006 Repository revision: 1.12 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/makefile,v Existing Tags: BRANCH_david_6 (branch: 1.11.2) END_BRANCH_david_5 (revision: 1.10) PREMERGE_BRANCH_david_5 (revision: 1.11) BRANCH_david_5 (branch: 1.10.16) END_david_spatial_2 (revision: 1.10) BRANCH_david_spatial_3 (branch: 1.10.14) END_BRANCH_david_4 (revision: 1.9) BRANCH_david_4_merge (branch: 1.10.12) PRE_MERGE_branch_david_4 (revision: 1.10) BRANCH_david_4_premerge (branch: 1.10.10) BRANCH_Surf (branch: 1.10.8) BRANCH_Surface (branch: 1.10.6) END_david_spatial (revision: 1.10) BRANCH_david_spatial_2 (branch: 1.10.4) BRANCH_david_spatial (branch: 1.10.2) BRANCH_david_4 (branch: 1.9.14) END_BRANCH_david_3 (revision: 1.9) PRE_MERGE_branch_david_3 (revision: 1.9) BRANCH_david_3_premerge (branch: 1.9.12) BRANCH_force_1 (branch: 1.9.10) BRANCH_david_3 (branch: 1.9.8) END_BRANCH_david_2 (revision: 1.9) PRE_MERGE_BRANCH_david_2 (revision: 1.9) BRANCH_david_2_merge (branch: 1.9.6) BRANCH_spatial_1 (branch: 1.9.4) BRANCH_david_2 (branch: 1.9.2) PRE_MERGE_david_1 (revision: 1.9) TAHOE_2_1 (revision: 1.8) BRANCH_david_1 (branch: 1.8.8) TAHOE_2_0 (revision: 1.8) TAHOE_1_X (branch: 1.8.6) TAHOE_1_4 (revision: 1.8) BRANCH_parameter_4 (branch: 1.8.4) END_BRANCH_LJ3D (revision: 1.7) PRE_MERGE_BRANCH_LJ3D (revision: 1.8) END_penetration_2 (revision: 1.7) PRE_MERGE_penetration_2 (revision: 1.8) END_bridging_6 (revision: 1.7) PRE_MERGE_bridging_6 (revision: 1.8) ROOT_BRANCH_NN (revision: 1.8) BRANCH_NN (branch: 1.8.2) END_bridging_5 (revision: 1.7) BRANCH_bridging_6 (branch: 1.7.32) BRANCH_LJ3D (branch: 1.7.30) ROOT_BRANCH_LJ3D (revision: 1.7) END_BRANCH_3DBS (revision: 1.7) END_BRANCH_BS3D (revision: 1.7) PRE_MERGE_BRANCH_BS3D (revision: 1.7) END_parameter_2 (revision: 1.7) BRANCH_parameter_3 (branch: 1.7.28) END_jzimmer_1 (revision: 1.7) PRE_MERGE_jzimmer_1 (revision: 1.7) END_penetration_1 (revision: 1.7) BRANCH_penetration_2 (branch: 1.7.26) BRANCH_jzimmer_1 (branch: 1.7.24) BRANCH_3DBS (branch: 1.7.22) BRANCH_penetration_1 (branch: 1.7.16) BRANCH_bridging_5 (branch: 1.7.20) END_bridging_4 (revision: 1.7) BRANCH_bridging_4 (branch: 1.7.18) BRANCH_BS3D (branch: 1.7.14) BRANCH_parameter_2 (branch: 1.7.12) ROOT_parameter_2 (revision: 1.7) END_paklein_3 (revision: 1.6) TAHOE_1_3 (revision: 1.7) BRANCH_solve_1 (branch: 1.7.10) END_bsun_2 (revision: 1.7) PRE_MERGE_bsun_2 (revision: 1.7) BRANCH_bsun_2 (branch: 1.7.8) ROOT_bsun_2 (revision: 1.7) END_bsun_1 (revision: 1.7) END_bridging_3 (revision: 1.7) PRE_MERGE_bridging_3 (revision: 1.7) BRANCH_bridging_3 (branch: 1.7.6) ROOT_bridging_3 (revision: 1.7) FRACTURE_INTERFACE_0_2 (branch: 1.7.4) BRANCH_bsun_1 (branch: 1.7.2) ROOT_bsun_1 (revision: 1.7) END_THK_3 (revision: 1.6) PRE_MERGE_THK_3 (revision: 1.7) BRANCH_cjkimme_1 (branch: 1.6.16) BRANCH_paklein_3 (branch: 1.6.12) BRANCH_THK_3 (branch: 1.6.14) ROOT_THK_3 (revision: 1.6) END_THK_2 (revision: 1.6) PRE_MERGE_THK_2 (revision: 1.6) TAHOE_1_2 (revision: 1.6) END_bridging_2 (revision: 1.6) PRE_MERGE_bridging_2 (revision: 1.6) BRANCH_THK_2 (branch: 1.6.10) ROOT_THK_2 (revision: 1.6) END_THK_1 (revision: 1.6) PRE_MERGE_THK_1 (revision: 1.6) END_bridging_1 (revision: 1.5) END_atom_1 (revision: 1.5) END_parameter_1 (revision: 1.6) BRANCH_bridging_2 (branch: 1.6.8) ROOT_bridging_2 (revision: 1.6) BRANCH_parameter_1 (branch: 1.6.6) ROOT_parameter_1 (revision: 1.6) TAHOE_1_1_0 (revision: 1.6) BRANCH_THK_1 (branch: 1.6.4) ROOT_THK_1 (revision: 1.6) PRE_MERGE_bridging_1 (revision: 1.6) BRANCH_conveyor_1 (branch: 1.6.2) TAHOE_1_0_1 (revision: 1.5) BRANCH_bridging_1 (branch: 1.5.20) ROOT_bridging_1 (revision: 1.5) TAHOE_1_0_0 (revision: 1.5) PRE_MERGE_atom_1 (revision: 1.5) T011503 (revision: 1.5) T010103 (revision: 1.5) T121502 (revision: 1.5) BRANCH_atom_1 (branch: 1.5.18) ROOT_atom_1 (revision: 1.5) T120102 (revision: 1.5) T111502 (revision: 1.5) PRE_MERGE_paklein_2 (revision: 1.5) END_paklein_2 (revision: 1.5) T110102 (revision: 1.5) ROOT_paklein_2 (revision: 1.5) BRANCH_paklein_2 (branch: 1.5.16) PRE_MERGE_paklein_1 (revision: 1.5) END_paklein_1 (revision: 1.5) BRANCH_SIERRA_1 (branch: 1.5.14) BRANCH_paklein_1 (branch: 1.5.12) ROOT_paklein_1 (revision: 1.5) T101502 (revision: 1.5) T100102 (revision: 1.5) PRE_MERGE_B_1 (revision: 1.5) BRANCH_B_1 (branch: 1.5.10) ROOT_B_1 (revision: 1.5) T091502 (revision: 1.5) T090102 (revision: 1.5) T081502 (revision: 1.5) T080102 (revision: 1.5) T071502 (revision: 1.5) PRE_MERGE_name_1 (branch: 1.5.8) T070102 (revision: 1.5) BRANCH_name_1 (branch: 1.5.6) T061502 (revision: 1.5) PRE_MERG_field_1 (revision: 1.5) END_field_1 (revision: 1.5) T060102 (revision: 1.5) T051502 (revision: 1.5) T050102 (revision: 1.5) BRANCH_field_1 (branch: 1.5.4) ROOT_field_1 (revision: 1.5) T041502 (revision: 1.5) T040102 (revision: 1.5) T031502 (revision: 1.5) T030102 (revision: 1.5) T021502 (revision: 1.5) T020102 (revision: 1.5) T011502 (revision: 1.5) T010102 (revision: 1.5) PRE_MERGE_model_1 (revision: 1.5) END_model_1 (revision: 1.5) T121501 (revision: 1.5) T120101 (revision: 1.5) T111501 (revision: 1.5) T110101 (revision: 1.5) T101501 (revision: 1.5) T100101 (revision: 1.5) BRANCH_model_1 (branch: 1.5.2) ROOT_model_1 (revision: 1.5) T091501 (revision: 1.5) T090101 (revision: 1.4) T081501 (revision: 1.4) T080101 (revision: 1.4) T071501 (revision: 1.4) END_solid_1 (revision: 1.4) PRE_MERGE_solid_1 (revision: 1.4) T070101 (revision: 1.4) END_meshfree_1 (revision: 1.4) BRANCH_meshfree_1 (branch: 1.4.4) ROOT_meshfree_1 (revision: 1.4) T061501 (revision: 1.4) BRANCH_solid_1 (branch: 1.4.2) ROOT_solid_1 (revision: 1.4) T060101 (revision: 1.4) T051601 (revision: 1.4) T050101 (revision: 1.4) HEAD (revision: 1.1.1.1) MAIN (branch: 1.1.1) |
From: R-J <r-...@us...> - 2006-11-16 00:59:52
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Wednesday November 15, 2006 @ 16:59 Author: r-...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv20234 Modified Files: PressureBCT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp> PressureBCT.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h> Log Message: added volume control via penalty, multipliers are next.. =================================================================== File: no file PressureBCT.cpp Status: Needs Checkout Working revision: 1.2 Thu Nov 16 00:59:52 2006 Repository revision: 1.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp,v Existing Tags: PRE_MERGE_David_6 (revision: 1.1) =================================================================== File: no file PressureBCT.h Status: Needs Checkout Working revision: 1.2 Thu Nov 16 00:59:52 2006 Repository revision: 1.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h,v Existing Tags: PRE_MERGE_David_6 (revision: 1.1) |
From: R-J <r-...@us...> - 2006-11-16 16:29:42
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Thursday November 16, 2006 @ 8:29 Author: r-...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv14258 Modified Files: PressureBCT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp> Log Message: one char bug =================================================================== File: no file PressureBCT.cpp Status: Needs Checkout Working revision: 1.3 Thu Nov 16 16:29:42 2006 Repository revision: 1.3 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp,v Existing Tags: PRE_MERGE_David_6 (revision: 1.1) |
From: R-J <r-...@us...> - 2006-11-20 17:27:38
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Monday November 20, 2006 @ 9:27 Author: r-...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv18090/src/nodes/FBC_controllers Modified Files: PressureBCT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp> PressureBCT.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h> Log Message: fixed issues with setting up the profile in pressure_bc volume_control and streamlined the whole thing. note the xml syntax has changed =================================================================== File: no file PressureBCT.cpp Status: Needs Checkout Working revision: 1.4 Mon Nov 20 17:27:35 2006 Repository revision: 1.4 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp,v Existing Tags: PRE_MERGE_David_6 (revision: 1.1) =================================================================== File: no file PressureBCT.h Status: Needs Checkout Working revision: 1.3 Mon Nov 20 17:27:35 2006 Repository revision: 1.3 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.h,v Existing Tags: PRE_MERGE_David_6 (revision: 1.1) |
From: R-J <r-...@us...> - 2007-10-09 23:17:48
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Tuesday October 9, 2007 @ 16:17 Author: r-...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25508/tahoe/src/nodes/FBC_controllers Modified Files: PressureBCT.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp> Log Message: minor mods =================================================================== File: no file PressureBCT.cpp Status: Needs Checkout Working revision: 1.5 Tue Oct 9 23:17:47 2007 Repository revision: 1.5 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/PressureBCT.cpp,v Existing Tags: MERGE_BSM_david (branch: 1.4.2) PREMERGE_BSM_david (revision: 1.4) PRE_MERGE_David_6 (revision: 1.1) |
From: Alejandro M. <lx...@us...> - 2008-07-14 18:25:06
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Monday July 14, 2008 @ 11:25 Author: lx...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31939/tahoe/src/nodes/FBC_controllers Modified Files: Penalty_AngledBC.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.h> Log Message: Removed trailing whitespace. =================================================================== File: Penalty_AngledBC.h Status: Up-to-date Working revision: 1.2 Mon Jul 14 18:25:16 2008 Repository revision: 1.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.h,v Existing Tags: No Tags Exist |
From: tdnguye <td...@us...> - 2009-05-21 22:30:59
|
$Id: log.pl,v 1.8 2006/05/27 01:05:57 paklein Exp $ =================================================================== Date: Thursday May 21, 2009 @ 22:30 Author: td...@us... Update of /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv15441/src/nodes/FBC_controllers Modified Files: Penalty_AngledBC.cpp: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.cpp> Penalty_AngledBC.h: <http://tahoe.cvs.sourceforge.net/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.h> Log Message: small changes =================================================================== File: Penalty_AngledBC.cpp Status: Up-to-date Working revision: 1.2 Thu May 21 22:30:26 2009 Repository revision: 1.2 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.cpp,v Existing Tags: No Tags Exist =================================================================== File: Penalty_AngledBC.h Status: Up-to-date Working revision: 1.3 Thu May 21 22:30:26 2009 Repository revision: 1.3 /cvsroot/tahoe/tahoe/src/nodes/FBC_controllers/Penalty_AngledBC.h,v Existing Tags: No Tags Exist |