dda-cvs Mailing List for Discontinuous Deformation Analysis
Status: Beta
Brought to you by:
doolin
Menu
▾
▴
dda-cvs — cvs mailing list for dda project
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(7) |
Jun
(6) |
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(10) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(7) |
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2006 |
Jan
|
Feb
|
Mar
(88) |
Apr
(32) |
May
(9) |
Jun
(63) |
Jul
(55) |
Aug
(7) |
Sep
(1) |
Oct
(3) |
Nov
(10) |
Dec
(3) |
| 2007 |
Jan
(2) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(8) |
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Roozbeh <rgr...@us...> - 2010-02-02 02:04:54
|
Update of /cvsroot/dda/htdocs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28713 Modified Files: members.php Log Message: new link for roozbeh_bio Index: members.php =================================================================== RCS file: /cvsroot/dda/htdocs/members.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** members.php 23 Oct 2006 16:47:43 -0000 1.5 --- members.php 2 Feb 2010 02:04:46 -0000 1.6 *************** *** 1,51 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <head> ! ! <?php ! include("header.php"); ! ?> ! ! <title> ! Members ! </title> ! ! </head> ! <body> ! <table border="4" width="100%" id="table1" cellpadding="10"> ! <tr> ! <td width="17%" valign="top" bgcolor="#CACAFF"> ! ! </td> ! ! <td width="78%" bgcolor="#CACAFF"> ! ! <p class="c2"> ! <span class="c1">Members</span> ! </p> ! </td> ! ! ! </tr> ! <tr> ! ! <td width="17%" valign="top" bgcolor="#CCCCFF"> ! <?php ! include("menu.php"); ! ?> ! </td> ! ! ! <td width="78%"> ! <?php ! include("dave_bio.htm"); ! ?> ! <?php ! include("Roozbeh_bio.htm"); ! ?> ! </td> ! </tr> ! </table> ! </body> ! </html> --- 1,51 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <head> ! ! <?php ! include("header.php"); ! ?> ! ! <title> ! Members ! </title> ! ! </head> ! <body> ! <table border="4" width="100%" id="table1" cellpadding="10"> ! <tr> ! <td width="17%" valign="top" bgcolor="#CACAFF"> ! ! </td> ! ! <td width="78%" bgcolor="#CACAFF"> ! ! <p class="c2"> ! <span class="c1">Members</span> ! </p> ! </td> ! ! ! </tr> ! <tr> ! ! <td width="17%" valign="top" bgcolor="#CCCCFF"> ! <?php ! include("menu.php"); ! ?> ! </td> ! ! ! <td width="78%"> ! <?php ! include("dave_bio.htm"); ! ?> ! <?php ! include("roozbeh_bio.html"); ! ?> ! </td> ! </tr> ! </table> ! </body> ! </html> |
|
From: Roozbeh <rgr...@us...> - 2010-02-02 02:02:17
|
Update of /cvsroot/dda/htdocs In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv28296 Modified Files: roozbeh_bio.html Log Message: added new link for roozbeh Index: roozbeh_bio.html =================================================================== RCS file: /cvsroot/dda/htdocs/roozbeh_bio.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** roozbeh_bio.html 23 Oct 2006 14:17:39 -0000 1.1 --- roozbeh_bio.html 2 Feb 2010 02:02:08 -0000 1.2 *************** *** 1,32 **** ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <head> ! <title></title> ! <style type="text/css"> ! /*<![CDATA[*/ ! p.c3 {text-align: justify} ! span.c2 {font-size: 12.0pt; font-family: Times New Roman} ! p.c1 {color: #0000FF; text-align: justify} ! /*]]>*/ ! </style> ! </head> ! <body> ! <p class="c1"> ! Roozbeh Grayeli: ! </p> ! <p class="c3"> ! <span class="c2">Roozbeh Grayeli earned a bachelor degree ! in Mining Engineering from <i>Poly-technique University</i> ! in Iran and entered University of Tehran as the top student ! for M.Sc. degree in rock mechanics. The title of his thesis ! is <i><b>Load distribution along fully grouted cable bolts ! in discontinuous rock masses using DDA ! method.</b></i></span> He is currently interested in ! extending DDA for more accurate assessment of deformation ! in both 2D and 3D analysis. For more information see: ! <a href= ! "http://www.roozbeh-Grayeli.4t.com">www.Roozbeh-Grayeli.4t.com</a> ! </p> ! </body> ! </html> --- 1,32 ---- ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> ! <head> ! <title></title> ! <style type="text/css"> ! /*<![CDATA[*/ ! p.c3 {text-align: justify} ! span.c2 {font-size: 12.0pt; font-family: Times New Roman} ! p.c1 {color: #0000FF; text-align: justify} ! /*]]>*/ ! </style> ! </head> ! <body> ! <div class="Section1"> ! <p class="c1"><span class="SpellE">Roozbeh</span> <span class="SpellE"> ! Grayeli</span>: </p> ! <p class="c3"><span class="SpellE"><span class="c2">Roozbeh</span></span><span class="c2"> ! <span class="SpellE">Grayeli</span> earned a bachelor degree in Mining ! Engineering from <i>Poly-technique University</i> in Iran and entered ! University of Tehran as the top student for M.Sc. degree in rock ! mechanics. The title of his thesis is <b><i>Load distribution along ! fully grouted cable bolts in discontinuous rock masses using DDA method.</i></b></span> ! He is currently interested in extending DDA for more accurate assessment ! of deformation in both 2D and 3D analysis. <span class="SpellE">Roozbeh</span> ! entered to University of Oklahoma (OU) as a PhD student from August 2007 ! and working on soil slope improvement using <span class="SpellE"> ! geosynthetics</span>, for more information see: ! <a href="http://www2.decf.berkeley.edu/~roozbehg/"> ! http://www2.decf.berkeley.edu/~roozbehg/</a> </div> ! </body> ! </html> |
|
From: David M. D. <do...@us...> - 2008-04-10 02:45:26
|
Update of /cvsroot/dda/ntdda In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv2244 Modified Files: ntdda.dsp Added Files: ntdda.sln ntdda.vcproj Log Message: Added vs2005 ide files. Index: ntdda.dsp =================================================================== RCS file: /cvsroot/dda/ntdda/ntdda.dsp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** ntdda.dsp 27 Nov 2007 02:51:08 -0000 1.45 --- ntdda.dsp 10 Apr 2008 02:45:21 -0000 1.46 *************** *** 1,554 **** ! # Microsoft Developer Studio Project File - Name="ntdda" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Application" 0x0101 ! ! CFG=ntdda - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE [...1079 lines suppressed...] ! SOURCE=.\include\gravity.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\material.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\postprocess.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\timehistory.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\utils.h ! # End Source File ! # End Target ! # End Project --- NEW FILE: ntdda.vcproj --- <?xml version="1.0" encoding="Windows-1252"?> <VisualStudioProject ProjectType="Visual C++" Version="8.00" Name="ntdda" ProjectGUID="{38F5E6BE-3306-4DB9-A177-5F89B64F099C}" > <Platforms> <Platform Name="Win32" /> </Platforms> <ToolFiles> </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" OutputDirectory=".\Debug" IntermediateDirectory=".\Debug" [...1919 lines suppressed...] <File RelativePath="include\material.h" > </File> <File RelativePath="include\postprocess.h" > </File> <File RelativePath="include\timehistory.h" > </File> <File RelativePath="include\utils.h" > </File> </Files> <Globals> </Globals> </VisualStudioProject> --- NEW FILE: ntdda.sln --- (This appears to be a binary file; contents omitted.) |
|
From: David M. D. <do...@us...> - 2008-04-10 02:30:01
|
Update of /cvsroot/dda/modec/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28199/include Modified Files: couplepoint.h object.h Log Message: Fresh build with vs2005. Index: couplepoint.h =================================================================== RCS file: /cvsroot/dda/modec/include/couplepoint.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** couplepoint.h 1 Jul 2006 01:23:34 -0000 1.1 --- couplepoint.h 10 Apr 2008 02:29:54 -0000 1.2 *************** *** 15,19 **** typedef struct _couplepoint Couplepoint; ! void couplepoint_update (Couplepoint * cpoint, --- 15,19 ---- typedef struct _couplepoint Couplepoint; ! Couplepoint * couplepoint_new(void); void couplepoint_update (Couplepoint * cpoint, Index: object.h =================================================================== RCS file: /cvsroot/dda/modec/include/object.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** object.h 11 Aug 2004 00:34:03 -0000 1.8 --- object.h 10 Apr 2008 02:29:54 -0000 1.9 *************** *** 23,27 **** typedef int (*ReadFunc) (void* stream, char* buf, ! size_t len); #ifndef MODEC_PRINTFUNC --- 23,27 ---- typedef int (*ReadFunc) (void* stream, char* buf, ! size_t len); #ifndef MODEC_PRINTFUNC *************** *** 32,41 **** #endif ! #ifndef MODEC_SCANFUNC ! typedef int (*ScanFunc) (void* stream, ! const char * format, ! ...); ! #define MODEC_SCANFUNC ! #endif #ifndef MODEC_WRITEFUNC --- 32,41 ---- #endif ! #ifndef MODEC_SCANFUNC ! typedef int (*ScanFunc) (void* stream, ! const char * format, ! ...); ! #define MODEC_SCANFUNC ! #endif #ifndef MODEC_WRITEFUNC *************** *** 71,79 **** #endif ! #ifndef MODEC_ALLOCATOR ! #define MODEC_ALLOCATOR ! typedef void * (*Allocator) (void); ! #endif ! /** --- 71,79 ---- #endif ! #ifndef MODEC_ALLOCATOR ! #define MODEC_ALLOCATOR ! typedef void * (*Allocator) (void); ! #endif ! /** *************** *** 86,96 **** Printer print; DeleteFunc delete_; ! CloneFunc clone; Allocator allocate; ! void * owner; ! /* Use this to pass around random junk like ! * a character string where print functions ! * are printing from. ! */ void * userdata; const char * type; --- 86,96 ---- Printer print; DeleteFunc delete_; ! CloneFunc clone; Allocator allocate; ! void * owner; ! /* Use this to pass around random junk like ! * a character string where print functions ! * are printing from. ! */ void * userdata; const char * type; *************** *** 123,132 **** const char * type); ! void object_set_printer (Object * o, ! Printer print_func); ! ! void object_set_userdata (Object * o, ! void * userdata); ! void * object_get_userdata (Object * o); --- 123,132 ---- const char * type); ! void object_set_printer (Object * o, ! Printer print_func); ! ! void object_set_userdata (Object * o, ! void * userdata); ! void * object_get_userdata (Object * o); |
|
From: David M. D. <do...@us...> - 2008-04-10 02:30:01
|
Update of /cvsroot/dda/modec/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv28199/src Modified Files: couplepoint.c ddaml.c geomddaml.c Log Message: Fresh build with vs2005. Index: ddaml.c =================================================================== RCS file: /cvsroot/dda/modec/src/ddaml.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ddaml.c 1 Jul 2006 01:23:34 -0000 1.2 --- ddaml.c 10 Apr 2008 02:29:54 -0000 1.3 *************** *** 18,32 **** #include "ddaml.h" ! ! //#if (_MSC_VER >= 1300) && (WINVER < 0x0500) ! //VC7 or later, building with pre-VC7 runtime libraries ! //extern "C" ! long _ftol( double ); //defined by VC6 C libs ! //extern "C" ! long _ftol2( double dblSource ) { return _ftol( dblSource ); ! } ! //#endif ! ! void --- 18,32 ---- #include "ddaml.h" ! ! //#if (_MSC_VER >= 1300) && (WINVER < 0x0500) ! //VC7 or later, building with pre-VC7 runtime libraries ! //extern "C" ! long _ftol( double ); //defined by VC6 C libs ! //extern "C" ! //long _ftol2( double dblSource ) { return _ftol( dblSource ); ! //} ! //#endif ! ! void *************** *** 65,69 **** exit (0); } ! #endif } --- 65,69 ---- exit (0); } ! #endif } Index: couplepoint.c =================================================================== RCS file: /cvsroot/dda/modec/src/couplepoint.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** couplepoint.c 4 Jul 2006 16:06:14 -0000 1.2 --- couplepoint.c 10 Apr 2008 02:29:54 -0000 1.3 *************** *** 22,31 **** Couplepoint * couplepoint_new() { - - Couplepoint * cp; cp = (Couplepoint *)calloc(1,sizeof(Couplepoint)); return cp; - } --- 22,28 ---- Index: geomddaml.c =================================================================== RCS file: /cvsroot/dda/modec/src/geomddaml.c,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** geomddaml.c 1 Jul 2006 01:23:35 -0000 1.24 --- geomddaml.c 10 Apr 2008 02:29:54 -0000 1.25 *************** *** 33,48 **** #include "ddamemory.h" #include "geometrydata.h" - - #include "rb.h" ! #include "point.h" ! #include "fpoint.h" #include "loadpoint.h" #include "bolt.h" ! #include "joint.h" ! #include "couplepoint.h" ! ! // Used for setting max_value and numticks. ! #include "postscript.h" --- 33,48 ---- #include "ddamemory.h" #include "geometrydata.h" ! #include "rb.h" ! ! #include "point.h" ! #include "fpoint.h" #include "loadpoint.h" #include "bolt.h" ! #include "joint.h" ! #include "couplepoint.h" ! ! // Used for setting max_value and numticks. ! #include "postscript.h" *************** *** 63,68 **** static xmlNsPtr nspace; ! ! Rb_node rb_tree; --- 63,68 ---- static xmlNsPtr nspace; ! ! Rb_node rb_tree; *************** *** 76,80 **** ! static DDALine * --- 76,80 ---- ! static DDALine * *************** *** 107,128 **** } ! ! void ! parseBarscale(void * userdata, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) { ! ! char * temp; ! ! if (temp = xmlGetProp(cur,"max_value")) { ! ps_set_max_value(atof(temp)); ! } else { ! } ! ! if (temp = xmlGetProp(cur,"numticks")) { ! ps_set_numticks(atoi(temp)); ! } else { ! } ! ! } ! --- 107,128 ---- } ! ! void ! parseBarscale(void * userdata, xmlDocPtr doc, xmlNsPtr ns, xmlNodePtr cur) { ! ! char * temp; ! ! if (temp = xmlGetProp(cur,"max_value")) { ! ps_set_max_value(atof(temp)); ! } else { ! } ! ! if (temp = xmlGetProp(cur,"numticks")) { ! ps_set_numticks(atoi(temp)); ! } else { ! } ! ! } ! *************** *** 206,210 **** } ! static void --- 206,210 ---- } ! static void *************** *** 280,284 **** FPoint * fp = fpoint_new(); tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_line((Point*)fp,tempstring); pointlist_append_point(gd->fpointlist,(Point*)fp); --- 280,284 ---- FPoint * fp = fpoint_new(); tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_line((Point*)fp,tempstring); pointlist_append_point(gd->fpointlist,(Point*)fp); *************** *** 290,306 **** pointlist_append_point(gd->fpointlist,(Point*)fp); ! } else if ((!strcmp(cur->name, "FPoint")) ) { ! ! double rotation,p1,p2; ! FPoint * fp = fpoint_new(); ! rotation = atof(xmlGetProp(cur, "rotation")); ! fpoint_set_rotation(fp,rotation); ! p1 = atof(xmlGetProp(cur, "p1")); ! p2 = atof(xmlGetProp(cur, "p2")); ! fpoint_set_pfactor(fp,p1,p2); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)fp); ! pointlist_append_point(gd->fpointlist,(Point*)fp); ! } else { --- 290,306 ---- pointlist_append_point(gd->fpointlist,(Point*)fp); ! } else if ((!strcmp(cur->name, "FPoint")) ) { ! ! double rotation,p1,p2; ! FPoint * fp = fpoint_new(); ! rotation = atof(xmlGetProp(cur, "rotation")); ! fpoint_set_rotation(fp,rotation); ! p1 = atof(xmlGetProp(cur, "p1")); ! p2 = atof(xmlGetProp(cur, "p2")); ! fpoint_set_pfactor(fp,p1,p2); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)fp); ! pointlist_append_point(gd->fpointlist,(Point*)fp); ! } else { *************** *** 334,340 **** Point * p = point_new(); tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,p); ! /** @todo Figure out a new way of handling errors from bad ddaml ! * input. */ if (p == NULL) { --- 334,340 ---- Point * p = point_new(); tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,p); ! /** @todo Figure out a new way of handling errors from bad ddaml ! * input. */ if (p == NULL) { *************** *** 408,482 **** while (cur != NULL) { ! ! if ((!strcmp(cur->name, "Point"))) { ! ! Loadpoint * lp = loadpoint_new(); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)lp); ! if (lp == NULL) { ! ddaml_display_error(error_string); ! } else { ! pointlist_append_point(gd->lpointlist,(Point*)lp); ! } ! } else { ! // Need to check for comment element in the xml before ! // deciding that we have an error ! //ddaml_display_error(error_string); ! } cur = cur->next; ! } } /* close parseLoadpointlist() */ ! ! //===== ! ! static void ! parse_couple_list(void * userdata, xmlDocPtr doc, ! xmlNsPtr ns, xmlNodePtr cur) { ! ! Geometrydata * gd = (Geometrydata*)userdata; ! ! //DDAPoint * point; ! /* Make the compiler link the floating point libraries. */ ! double temp[2] = {0.0}; ! char * tempstring; ! char * error_string = "Couple point failure, contact author"; ! ! //int checkval; ! ! //ddaml_display_error(error_string); ! ! /* Don't care about parent */ ! cur = cur->children; ! ! while (cur != NULL) { ! ! if ((!strcmp(cur->name, "Point"))) { ! ! Couplepoint * cp = couplepoint_new(); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)cp); ! if (cp == NULL) { ! ddaml_display_error(error_string); ! } else { ! pointlist_append_point(gd->cpointlist,(Point*)cp); ! } ! } else { ! // Need to check for comment element in the xml before ! // deciding that we have an error ! //ddaml_display_error(error_string); ! } ! ! cur = cur->next; ! } ! ! } /* close parse_couple_list() */ ! //===== ! ! static void parseHolepointlist(void * userdata, xmlDocPtr doc, --- 408,482 ---- while (cur != NULL) { ! ! if ((!strcmp(cur->name, "Point"))) { ! ! Loadpoint * lp = loadpoint_new(); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)lp); ! if (lp == NULL) { ! ddaml_display_error(error_string); ! } else { ! pointlist_append_point(gd->lpointlist,(Point*)lp); ! } ! } else { ! // Need to check for comment element in the xml before ! // deciding that we have an error ! //ddaml_display_error(error_string); ! } cur = cur->next; ! } } /* close parseLoadpointlist() */ ! //===== ! ! static void ! parse_couple_list(void * userdata, xmlDocPtr doc, ! xmlNsPtr ns, xmlNodePtr cur) { ! ! Geometrydata * gd = (Geometrydata*)userdata; ! ! //DDAPoint * point; ! /* Make the compiler link the floating point libraries. */ ! double temp[2] = {0.0}; ! char * tempstring; ! char * error_string = "Couple point failure, contact author"; ! ! //int checkval; ! ! //ddaml_display_error(error_string); ! ! /* Don't care about parent */ ! cur = cur->children; ! ! while (cur != NULL) { ! ! if ((!strcmp(cur->name, "Point"))) { ! ! Couplepoint * cp = couplepoint_new(); ! tempstring = xmlNodeListGetString(doc, cur->children, 1); ! parse_a_point(tempstring,(Point*)cp); ! if (cp == NULL) { ! ddaml_display_error(error_string); ! } else { ! pointlist_append_point(gd->cpointlist,(Point*)cp); ! } ! } else { ! // Need to check for comment element in the xml before ! // deciding that we have an error ! //ddaml_display_error(error_string); ! } ! ! cur = cur->next; ! } ! ! } /* close parse_couple_list() */ ! ! //===== ! ! static void parseHolepointlist(void * userdata, xmlDocPtr doc, *************** *** 701,705 **** ! /* FIXME: Move this code into geometrydata.c so that it can * called from anywhere. */ --- 701,705 ---- ! /* FIXME: Move this code into geometrydata.c so that it can * called from anywhere. */ *************** *** 791,818 **** {"Matlinelist", 0, *parseMatlinelist }, {"Boundlist", 0, *parseBoundlist }, ! {"Barscale", 0, *parseBarscale }, {NULL, 0, 0 } }; ! ! KWDTAB * ! kwdtab_new() { ! ! KWDTAB * kt = (KWDTAB*)malloc(sizeof(KWDTAB)); ! memset(kt,0xda,sizeof(KWDTAB)); ! return kt; ! } ! ! void ! ddaml_register_parsefn(Rb_node rb, char * el_name, int ktok, NodeParser nodeparse) { ! ! KWDTAB * kt = kwdtab_new(); ! kt->kwd = el_name; ! kt->ktok = ktok; ! kt->parsefn.nodeparse = nodeparse; ! ! rb_insert(rb,kt->kwd,kt); ! } ! static void --- 791,818 ---- {"Matlinelist", 0, *parseMatlinelist }, {"Boundlist", 0, *parseBoundlist }, ! {"Barscale", 0, *parseBarscale }, {NULL, 0, 0 } }; ! ! KWDTAB * ! kwdtab_new() { ! ! KWDTAB * kt = (KWDTAB*)malloc(sizeof(KWDTAB)); ! memset(kt,0xda,sizeof(KWDTAB)); ! return kt; ! } ! ! void ! ddaml_register_parsefn(Rb_node rb, char * el_name, int ktok, NodeParser nodeparse) { ! ! KWDTAB * kt = kwdtab_new(); ! kt->kwd = el_name; ! kt->ktok = ktok; ! kt->parsefn.nodeparse = nodeparse; ! ! rb_insert(rb,kt->kwd,kt); ! } ! static void *************** *** 820,830 **** xmlNsPtr ns, xmlNodePtr cur) { ! int i = 0; ! int found; ! ! // Experiment with ststic members. ! //KWDTAB kwt; ! KWDTAB * handler; ! Rb_node tmp; if (cur == NULL) { --- 820,830 ---- xmlNsPtr ns, xmlNodePtr cur) { ! int i = 0; ! int found; ! ! // Experiment with ststic members. ! //KWDTAB kwt; ! KWDTAB * handler; ! Rb_node rb_tmp; if (cur == NULL) { *************** *** 840,849 **** * be used in the main code. */ ! initializeGLists(); ! rb_tree = rb_new(); ! ! ddaml_register_parsefn(rb_tree,"Fixedpointlist",0,parseFixedpointlist); ! ddaml_register_parsefn(rb_tree,"Measuredpointlist",0,parseMeasuredpointlist); ! ddaml_register_parsefn(rb_tree,"Couplelist",0,parse_couple_list); /** This is global and not thread safe. */ --- 840,849 ---- * be used in the main code. */ ! initializeGLists(); ! rb_tree = rb_new(); ! ! ddaml_register_parsefn(rb_tree,"Fixedpointlist",0,parseFixedpointlist); ! ddaml_register_parsefn(rb_tree,"Measuredpointlist",0,parseMeasuredpointlist); ! ddaml_register_parsefn(rb_tree,"Couplelist",0,parse_couple_list); /** This is global and not thread safe. */ *************** *** 878,892 **** } i++; ! } ! ! ! #if 1 ! tmp = rb_find_key_n(rb_tree, (char*)cur->name, &found); ! if (found) { ! handler = (KWDTAB*)tmp->v.val; ! handler->parsefn.nodeparse((void*)gd,doc,ns,cur); ! } ! #endif ! cur = cur->next; } --- 878,892 ---- } i++; ! } ! ! ! #if 1 ! rb_tmp = rb_find_key_n(rb_tree, (char*)cur->name, &found); ! if (found) { ! handler = (KWDTAB*)rb_tmp->v.val; ! handler->parsefn.nodeparse((void*)gd,doc,ns,cur); ! } ! #endif ! cur = cur->next; } *************** *** 902,909 **** xmlDocPtr doc; xmlNsPtr ns; ! xmlNodePtr cur; ! xmlNode *root_element = NULL; ! ! Geometrydata * gd = (Geometrydata *)userdata; --- 902,909 ---- xmlDocPtr doc; xmlNsPtr ns; ! xmlNodePtr cur; ! xmlNode *root_element = NULL; ! ! Geometrydata * gd = (Geometrydata *)userdata; *************** *** 925,935 **** //cur = doc->root; //ns = nspace; ! ! ! root_element = xmlDocGetRootElement(doc); ! cur = root_element; ! ns = nspace; ! ! /* Here, we not only do not want the parent, we want to --- 925,935 ---- //cur = doc->root; //ns = nspace; ! ! ! root_element = xmlDocGetRootElement(doc); ! cur = root_element; ! ns = nspace; ! ! /* Here, we not only do not want the parent, we want to |
|
From: Roozbeh <rgr...@us...> - 2008-04-10 01:34:43
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6335 Modified Files: datalog.h Log Message: the time info dialog which is running at the end of each solution has been enabled Index: datalog.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/datalog.h,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** datalog.h 6 Jul 2006 02:28:37 -0000 1.9 --- datalog.h 10 Apr 2008 01:34:36 -0000 1.10 *************** *** 57,62 **** clock_t assemble_runtime; clock_t integration_runtime; ! //clock_t solve_runtime; ! //clock_t openclose_runtime; //clock_t contact_runtime; //clock_t update_runtime; --- 57,62 ---- clock_t assemble_runtime; clock_t integration_runtime; ! clock_t solve_runtime; ! clock_t openclose_runtime; //clock_t contact_runtime; //clock_t update_runtime; |
|
From: Roozbeh <rgr...@us...> - 2008-04-10 01:34:16
|
Update of /cvsroot/dda/ntdda/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6298 Modified Files: postprocess.c Log Message: the time info dialog which is running at the end of each solution has been enabled Index: postprocess.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/postprocess.c,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** postprocess.c 17 Dec 2003 23:36:36 -0000 1.19 --- postprocess.c 10 Apr 2008 01:34:13 -0000 1.20 *************** *** 46,51 **** double assemble_runtime; double integration_runtime; ! //double solve_runtime; ! //double openclose_runtime; //double contact_runtime; //double update_runtime; --- 46,51 ---- double assemble_runtime; double integration_runtime; ! double solve_runtime; ! double openclose_runtime; //double contact_runtime; //double update_runtime; *************** *** 60,66 **** //update_runtime = DLog->update_runtime/(double)CLOCKS_PER_SEC; assemble_runtime = DLog->assemble_runtime/(double)CLOCKS_PER_SEC; ! //solve_runtime = DLog->solve_runtime/(double)CLOCKS_PER_SEC; integration_runtime = DLog->integration_runtime/(double)CLOCKS_PER_SEC; ! //openclose_runtime = DLog->openclose_runtime/(double)CLOCKS_PER_SEC; totaloc_count = AData->n9; --- 60,66 ---- //update_runtime = DLog->update_runtime/(double)CLOCKS_PER_SEC; assemble_runtime = DLog->assemble_runtime/(double)CLOCKS_PER_SEC; ! solve_runtime = DLog->solve_runtime/(double)CLOCKS_PER_SEC; integration_runtime = DLog->integration_runtime/(double)CLOCKS_PER_SEC; ! openclose_runtime = DLog->openclose_runtime/(double)CLOCKS_PER_SEC; totaloc_count = AData->n9; *************** *** 72,78 **** sprintf(temp, "Assembly run time: %2.3f seconds\n", assemble_runtime); strcat(mess, temp); ! //sprintf(temp, "Solve run time: %2.3f seconds\n", solve_runtime); strcat(mess, temp); ! //sprintf(temp, "Penalty run time: %2.3f seconds\n", openclose_runtime-solve_runtime); strcat(mess, temp); --- 72,78 ---- sprintf(temp, "Assembly run time: %2.3f seconds\n", assemble_runtime); strcat(mess, temp); ! sprintf(temp, "Solve run time: %2.3f seconds\n", solve_runtime); strcat(mess, temp); ! sprintf(temp, "Penalty run time: %2.3f seconds\n", openclose_runtime-solve_runtime); strcat(mess, temp); |
|
From: Roozbeh <rgr...@us...> - 2008-04-10 01:33:55
|
Update of /cvsroot/dda/ntdda/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv5939 Modified Files: combineddf.c Log Message: the time info dialog which is running at the end of each solution has been enabled Index: combineddf.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/combineddf.c,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** combineddf.c 17 Dec 2003 23:36:36 -0000 1.49 --- combineddf.c 10 Apr 2008 01:33:51 -0000 1.50 *************** *** 18,21 **** --- 18,24 ---- /* * $Log$ + * Revision 1.50 2008/04/10 01:33:51 rgrayeli + * the time info dialog which is running at the end of each solution has been enabled + * * Revision 1.49 2003/12/17 23:36:36 doolin * Merged in my changes from final mil-4 checkout. *************** *** 756,761 **** DLog = datalog_new( ad->nTimeSteps, ad->nJointMats, gd->nBlocks); /* Clock stopped in postProces() */ ! //DLog->analysis_start = clock(); ! //DLog->assemble_runtime = 0; initStorageTempArrays(gd->nBlocks); --- 759,764 ---- DLog = datalog_new( ad->nTimeSteps, ad->nJointMats, gd->nBlocks); /* Clock stopped in postProces() */ ! DLog->analysis_start = clock(); ! DLog->assemble_runtime = 0; initStorageTempArrays(gd->nBlocks); |
|
From: Roozbeh <rgr...@us...> - 2008-04-10 00:58:57
|
Update of /cvsroot/dda/ntdda/src In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24775 Modified Files: timestep.c Log Message: Fixed computeTimeStep() subroutine to solve the automatic time computing which was caused hanging up during dynamic analysis Index: timestep.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/timestep.c,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** timestep.c 20 Dec 2002 05:20:02 -0000 1.41 --- timestep.c 10 Apr 2008 00:58:50 -0000 1.42 *************** *** 558,562 **** a1=a3; ! a2 = globalTime[ad->cts-1][1]*maxdisplacement*domainscale/(ad->delta_t); if (analysisType == STATIC) /* analysisType == 0 is static type analysis, */ --- 558,567 ---- a1=a3; ! //globalTime[i][0]: cumulative time from 0 seconds; ! //globalTime[i][1]: displacement ratios??? ! //the globalTime[ad->cts-1][1] term which is displacement ratio ! //has been changed to cumulative time (globalTime[ad->cts-1][0]) ! //by Roozbeh ! a2 = globalTime[ad->cts-1][0]*maxdisplacement*domainscale/(ad->delta_t); // Changed by Roozbeh if (analysisType == STATIC) /* analysisType == 0 is static type analysis, */ |
|
From: Roozbeh <rgr...@us...> - 2008-04-04 23:55:55
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv18404 Modified Files: Dda.rc Log Message: New bottoms are added into toolbar menu by Roozbeh Index: Dda.rc =================================================================== RCS file: /cvsroot/dda/ntdda/include/Dda.rc,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Dda.rc 27 Nov 2007 04:04:28 -0000 1.11 --- Dda.rc 4 Apr 2008 23:55:51 -0000 1.12 *************** *** 49,52 **** --- 49,57 ---- BUTTON TOOLBAR_ZOOMOUT BUTTON TOOLBAR_ZOOMBACK + BUTTON TOOLBAR_GOLEFT + BUTTON TOOLBAR_GORIGHT + BUTTON TOOLBAR_GOUP + BUTTON TOOLBAR_GODOWN + BUTTON ID_BUTTON40063 SEPARATOR BUTTON ID_FILE_SAVE *************** *** 203,206 **** --- 208,212 ---- ICON_FLAGS ICON DISCARDABLE "..\\resources\\flag.ico" ICON_GRAVITY ICON DISCARDABLE "..\\resources\\gravity.ico" + IDI_ICON3 ICON DISCARDABLE "..\\resources\\destroy.ico" ///////////////////////////////////////////////////////////////////////////// |
|
From: Roozbeh <rgr...@us...> - 2008-04-04 23:53:05
|
Update of /cvsroot/dda/ntdda/resources In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv17304 Modified Files: Toolbar.bmp Log Message: New bottoms are added into toolbar menu by Roozbeh Index: Toolbar.bmp =================================================================== RCS file: /cvsroot/dda/ntdda/resources/Toolbar.bmp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 Binary files /tmp/cvsDj20kI and /tmp/cvsB643UO differ |
|
From: Roozbeh <rgr...@us...> - 2008-04-04 23:47:23
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15398 Modified Files: toolbar.c Log Message: New bottoms are added into toolbar menu by Roozbeh Index: toolbar.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/toolbar.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** toolbar.c 27 Nov 2007 04:02:29 -0000 1.4 --- toolbar.c 4 Apr 2008 23:47:19 -0000 1.5 *************** *** 91,94 **** --- 91,98 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOLEFT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GORIGHT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOUP, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GODOWN, TBSTATE_ENABLED); //Added by Roozbeh break; *************** *** 103,106 **** --- 107,114 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, 0); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, 0); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOLEFT, 0); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GORIGHT, 0); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOUP, 0); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GODOWN, 0); //Added by Roozbeh break; *************** *** 115,118 **** --- 123,130 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOLEFT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GORIGHT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GOUP, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_GODOWN, TBSTATE_ENABLED); //Added by Roozbeh break; *************** *** 148,151 **** --- 160,168 ---- {8, TOOLBAR_ZOOMIN, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh {9, TOOLBAR_ZOOMBACK, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + {10, TOOLBAR_GOLEFT, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + {11, TOOLBAR_GORIGHT, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + {12, TOOLBAR_GOUP, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + {13, TOOLBAR_GODOWN, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + //{6, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} //{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, |
|
From: Roozbeh <rgr...@us...> - 2008-04-04 23:46:46
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv15036 Modified Files: resource.h Log Message: New bottoms are added into toolbar menu by Roozbeh Index: resource.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/resource.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** resource.h 27 Nov 2007 04:04:56 -0000 1.6 --- resource.h 4 Apr 2008 23:46:40 -0000 1.7 *************** *** 101,104 **** --- 101,105 ---- #define IDD_ARC 173 #define IDD_BLOCK 174 + #define IDI_ICON3 175 #define IDD_DIALOG1 200 #define IDD_BLOCKPROPS 200 *************** *** 371,374 **** --- 372,380 ---- #define OPTIONS_MEASUREDPOINTS 40061 #define TOOLBAR_ZOOMBACK 40062 + #define ID_BUTTON40063 40063 + #define TOOLBAR_GOLEFT 40064 + #define TOOLBAR_GORIGHT 40065 + #define TOOLBAR_GOUP 40066 + #define TOOLBAR_GODOWN 40067 #define ID_INDICATOR_MODE 59142 #define ID_INDICATOR_GRID 59143 *************** *** 380,385 **** #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 175 ! #define _APS_NEXT_COMMAND_VALUE 40063 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 101 --- 386,391 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 176 ! #define _APS_NEXT_COMMAND_VALUE 40068 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 101 |
|
From: Roozbeh <rgr...@us...> - 2008-04-04 23:45:25
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv14647 Modified Files: winmain.c Log Message: New bottoms are added into toolbar menu by Roozbeh. Some changes have been done in handle zoommove() function as well. Index: winmain.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/winmain.c,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** winmain.c 27 Nov 2007 04:02:54 -0000 1.46 --- winmain.c 4 Apr 2008 23:45:16 -0000 1.47 *************** *** 62,67 **** - - // Get rid of this as well. --- 62,65 ---- *************** *** 500,504 **** // Added By Roozbeh static int ! handleZoom(HWND hwMain, int z) { --- 498,502 ---- // Added By Roozbeh static int ! handleZoomMove(HWND hwMain, int z) { *************** *** 525,528 **** --- 523,539 ---- zoom = 25000; break; + // handle moving part + case (3): + xoff = xoff - delta; // Added By Roozbeh + break; + case (4): + xoff = xoff + delta; // Added By Roozbeh + break; + case (5): + yoff = yoff - delta; // Added By Roozbeh + break; + case (6): + yoff = yoff + delta; // Added By Roozbeh + break; } *************** *** 1634,1637 **** --- 1645,1652 ---- "Zoom out", "Zoom back", //Added by Roozbeh + "Go Left", //Added by Roozbeh + "Go Right", //Added by Roozbeh + "Go Up", //Added by Roozbeh + "Go Down", //Added by Roozbeh "Print" }; *************** *** 1687,1693 **** lpToolTipText->lpszText = ttt[8]; //Added by Roozbeh break; ! case TOOLBAR_PRINT: ! lpToolTipText->lpszText = ttt[9]; break; --- 1702,1719 ---- lpToolTipText->lpszText = ttt[8]; //Added by Roozbeh break; ! case TOOLBAR_GOLEFT: ! lpToolTipText->lpszText = ttt[9]; //Added by Roozbeh ! break; ! case TOOLBAR_GORIGHT: ! lpToolTipText->lpszText = ttt[10]; //Added by Roozbeh ! break; ! case TOOLBAR_GOUP: ! lpToolTipText->lpszText = ttt[11]; //Added by Roozbeh ! break; ! case TOOLBAR_GODOWN: ! lpToolTipText->lpszText = ttt[12]; //Added by Roozbeh ! break; case TOOLBAR_PRINT: ! lpToolTipText->lpszText = ttt[13]; break; *************** *** 2044,2054 **** // Added By Roozbeh case TOOLBAR_ZOOMOUT: ! handleZoom(hwMain,0); break; case TOOLBAR_ZOOMIN: ! handleZoom(hwMain,1); break; case TOOLBAR_ZOOMBACK: ! handleZoom(hwMain,2); break; // Added By Roozbeh --- 2070,2092 ---- // Added By Roozbeh case TOOLBAR_ZOOMOUT: ! handleZoomMove(hwMain,0); break; case TOOLBAR_ZOOMIN: ! handleZoomMove(hwMain,1); break; case TOOLBAR_ZOOMBACK: ! handleZoomMove(hwMain,2); ! break; ! case TOOLBAR_GOLEFT: ! handleZoomMove(hwMain,3); ! break; ! case TOOLBAR_GORIGHT: ! handleZoomMove(hwMain,4); ! break; ! case TOOLBAR_GOUP: ! handleZoomMove(hwMain,5); ! break; ! case TOOLBAR_GODOWN: ! handleZoomMove(hwMain,6); break; // Added By Roozbeh |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 04:05:32
|
Update of /cvsroot/dda/ntdda/resources In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31545 Modified Files: Toolbar.bmp Log Message: Added zoom back buttom in the toolbar by Roozbeh Index: Toolbar.bmp =================================================================== RCS file: /cvsroot/dda/ntdda/resources/Toolbar.bmp,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 Binary files /tmp/cvsAkOPaZ and /tmp/cvsBKjtiL differ |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 04:04:59
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31179 Modified Files: resource.h Log Message: Added zoom back buttom in the toolbar by Roozbeh Index: resource.h =================================================================== RCS file: /cvsroot/dda/ntdda/include/resource.h,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** resource.h 1 Aug 2006 05:26:10 -0000 1.5 --- resource.h 27 Nov 2007 04:04:56 -0000 1.6 *************** *** 370,373 **** --- 370,374 ---- #define OPTIONS_BLOCKAREAS 40060 #define OPTIONS_MEASUREDPOINTS 40061 + #define TOOLBAR_ZOOMBACK 40062 #define ID_INDICATOR_MODE 59142 #define ID_INDICATOR_GRID 59143 *************** *** 380,384 **** #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 175 ! #define _APS_NEXT_COMMAND_VALUE 40062 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 101 --- 381,385 ---- #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 175 ! #define _APS_NEXT_COMMAND_VALUE 40063 #define _APS_NEXT_CONTROL_VALUE 1088 #define _APS_NEXT_SYMED_VALUE 101 |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 04:04:32
|
Update of /cvsroot/dda/ntdda/include In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv31163 Modified Files: Dda.rc Log Message: Added zoom back buttom in the toolbar by Roozbeh Index: Dda.rc =================================================================== RCS file: /cvsroot/dda/ntdda/include/Dda.rc,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** Dda.rc 10 Dec 2006 16:32:34 -0000 1.10 --- Dda.rc 27 Nov 2007 04:04:28 -0000 1.11 *************** *** 1,1086 **** ! //Microsoft Developer Studio generated resource script. ! // ! #include "resource.h" ! ! #define APSTUDIO_READONLY_SYMBOLS ! ///////////////////////////////////////////////////////////////////////////// ! // ! // Generated from the TEXTINCLUDE 2 resource. ! // ! #define APSTUDIO_HIDDEN_SYMBOLS [...2144 lines suppressed...] ! BOTTOMMARGIN, 204 ! END ! END ! #endif // APSTUDIO_INVOKED ! ! #endif // English (U.K.) resources ! ///////////////////////////////////////////////////////////////////////////// ! ! ! ! #ifndef APSTUDIO_INVOKED ! ///////////////////////////////////////////////////////////////////////////// ! // ! // Generated from the TEXTINCLUDE 3 resource. ! // ! ! ! ///////////////////////////////////////////////////////////////////////////// ! #endif // not APSTUDIO_INVOKED ! |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 04:02:57
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30456 Modified Files: winmain.c Log Message: Added zoom back buttom in the toolbar by Roozbeh Index: winmain.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/winmain.c,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** winmain.c 27 Nov 2007 02:44:10 -0000 1.45 --- winmain.c 27 Nov 2007 04:02:54 -0000 1.46 *************** *** 500,504 **** // Added By Roozbeh static int ! handleZoominoutdown(HWND hwMain, int z) { --- 500,504 ---- // Added By Roozbeh static int ! handleZoom(HWND hwMain, int z) { *************** *** 521,524 **** --- 521,528 ---- zoom = (long)floor(zoom/1.2); break; + + case (2): + zoom = 25000; + break; } *************** *** 1629,1632 **** --- 1633,1637 ---- "Zoom in", "Zoom out", + "Zoom back", //Added by Roozbeh "Print" }; *************** *** 1678,1684 **** lpToolTipText->lpszText = ttt[7]; break; case TOOLBAR_PRINT: ! lpToolTipText->lpszText = ttt[8]; break; --- 1683,1693 ---- lpToolTipText->lpszText = ttt[7]; break; + + case TOOLBAR_ZOOMBACK: + lpToolTipText->lpszText = ttt[8]; //Added by Roozbeh + break; case TOOLBAR_PRINT: ! lpToolTipText->lpszText = ttt[9]; break; *************** *** 2035,2042 **** // Added By Roozbeh case TOOLBAR_ZOOMOUT: ! handleZoominoutdown(hwMain,0); break; case TOOLBAR_ZOOMIN: ! handleZoominoutdown(hwMain,1); break; // Added By Roozbeh --- 2044,2054 ---- // Added By Roozbeh case TOOLBAR_ZOOMOUT: ! handleZoom(hwMain,0); break; case TOOLBAR_ZOOMIN: ! handleZoom(hwMain,1); ! break; ! case TOOLBAR_ZOOMBACK: ! handleZoom(hwMain,2); break; // Added By Roozbeh |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 04:02:33
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30430 Modified Files: toolbar.c Log Message: Added zoom back buttom in the toolbar by Roozbeh Index: toolbar.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/toolbar.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** toolbar.c 27 Nov 2007 02:42:40 -0000 1.3 --- toolbar.c 27 Nov 2007 04:02:29 -0000 1.4 *************** *** 90,93 **** --- 90,94 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, TBSTATE_ENABLED); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, TBSTATE_ENABLED); //Added by Roozbeh break; *************** *** 101,105 **** toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, 0); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, 0); //Added by Roozbeh ! break; --- 102,106 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, 0); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, 0); //Added by Roozbeh ! toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, 0); //Added by Roozbeh break; *************** *** 113,116 **** --- 114,118 ---- toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, TBSTATE_ENABLED); //Added by Roozbeh toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_ZOOMBACK, TBSTATE_ENABLED); //Added by Roozbeh break; *************** *** 145,148 **** --- 147,151 ---- {7, TOOLBAR_ZOOMOUT, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh {8, TOOLBAR_ZOOMIN, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh + {9, TOOLBAR_ZOOMBACK, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh //{6, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} //{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 02:51:11
|
Update of /cvsroot/dda/ntdda In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv6340 Modified Files: ntdda.dsp Log Message: blockdialog.c has been added to src file list Index: ntdda.dsp =================================================================== RCS file: /cvsroot/dda/ntdda/ntdda.dsp,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** ntdda.dsp 1 Aug 2006 06:16:27 -0000 1.44 --- ntdda.dsp 27 Nov 2007 02:51:08 -0000 1.45 *************** *** 1,550 **** ! # Microsoft Developer Studio Project File - Name="ntdda" - Package Owner=<4> ! # Microsoft Developer Studio Generated Build File, Format Version 6.00 ! # ** DO NOT EDIT ** ! ! # TARGTYPE "Win32 (x86) Application" 0x0101 ! ! CFG=ntdda - Win32 Debug ! !MESSAGE This is not a valid makefile. To build this project using NMAKE, ! !MESSAGE use the Export Makefile command and run ! !MESSAGE [...1075 lines suppressed...] ! SOURCE=.\include\gravity.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\material.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\postprocess.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\timehistory.h ! # End Source File ! # Begin Source File ! ! SOURCE=.\include\utils.h ! # End Source File ! # End Target ! # End Project |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 02:44:15
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3781 Modified Files: winmain.c Log Message: new subroutine added by Roozbeh in which zoomin and zoomout will be handled Index: winmain.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/winmain.c,v retrieving revision 1.44 retrieving revision 1.45 diff -C2 -d -r1.44 -r1.45 *** winmain.c 1 Jul 2006 15:20:58 -0000 1.44 --- winmain.c 27 Nov 2007 02:44:10 -0000 1.45 *************** *** 39,43 **** #include "toolbar.h" #include "statusbar.h" ! #include "runstates.h" #include "dxf.h" --- 39,44 ---- #include "toolbar.h" #include "statusbar.h" ! #include "runstates.h" ! #include "dxf.h" *************** *** 59,64 **** char szAppName[] = "DDA for Windows"; char mess[80]; /* mess appears to be a temporary variable. Might be able to get rid of it. */ ! ! // Get rid of this as well. --- 60,67 ---- char szAppName[] = "DDA for Windows"; char mess[80]; /* mess appears to be a temporary variable. Might be able to get rid of it. */ ! ! ! ! // Get rid of this as well. *************** *** 142,154 **** ! void ! set_mainwindow_titlebar(HWND hwMain, char * filetype, char * filename) { ! ! char mainWinTitle[120]; ! ! sprintf(mainWinTitle, "%s --- %s: %s",szAppName,filetype,filepath.gfile); ! SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! } ! void --- 145,166 ---- ! void ! ! set_mainwindow_titlebar(HWND hwMain, char * filetype, char * filename) { ! ! ! ! char mainWinTitle[120]; ! ! ! ! sprintf(mainWinTitle, "%s --- %s: %s",szAppName,filetype,filepath.gfile); ! ! SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! } ! ! ! void *************** *** 403,412 **** static int handleKeydown(HWND hwMain, WPARAM wParam, LPARAM lParam) { ! // Added By Roozbeh int wparamlo, wparamhi; ! short delta = 100; ! ! if (whatToDraw == LINES || whatToDraw == BLOCKS) { /* Get the value of LOWORD and HIWORD. --- 415,428 ---- static int handleKeydown(HWND hwMain, WPARAM wParam, LPARAM lParam) { ! ! // Added By Roozbeh int wparamlo, wparamhi; ! short delta = 100; ! ! ! ! if (whatToDraw == LINES || whatToDraw == BLOCKS) { ! /* Get the value of LOWORD and HIWORD. *************** *** 414,422 **** wparamlo = LOWORD(wParam); wparamhi = HIWORD(wParam); - - switch (wparamlo) { ! /* Moving the model using the Left, Right ! * Up and Dwon button. */ case (VK_LEFT): --- 430,442 ---- wparamlo = LOWORD(wParam); wparamhi = HIWORD(wParam); ! ! switch (wparamlo) { ! ! ! /* Moving the model using the Left, Right ! ! * Up and Dwon button. ! */ case (VK_LEFT): *************** *** 428,432 **** break; ! case (VK_UP): yoff = yoff + delta; break; --- 448,453 ---- break; ! case (VK_UP): ! yoff = yoff + delta; break; *************** *** 434,438 **** case (VK_DOWN): yoff = yoff - delta; ! break; /* Zoom in By pressing the Add button. --- 455,460 ---- case (VK_DOWN): yoff = yoff - delta; ! break; ! /* Zoom in By pressing the Add button. *************** *** 440,464 **** */ case (VK_ADD): ! zoom = (long)floor(zoom*1.2); break; ! case (VK_SUBTRACT): zoom = (long)floor(zoom/1.2); ! break; default: break; ! } ! ! InvalidateRect(hwMain, NULL, TRUE); UpdateWindow(hwMain); ! } // Added By Roozbeh ! #if 0 { char mess[128]; sprintf(mess, "nVirtKey: %d",wParam); ! MessageBox(NULL,mess,"keydown",MB_OK); } #endif --- 462,495 ---- */ case (VK_ADD): ! zoom = (long)floor(zoom*1.2); ! break; ! ! case (VK_SUBTRACT): zoom = (long)floor(zoom/1.2); ! break; ! default: break; ! } ! ! ! ! InvalidateRect(hwMain, NULL, TRUE); ! UpdateWindow(hwMain); ! } ! // Added By Roozbeh ! #if 0 ! { char mess[128]; sprintf(mess, "nVirtKey: %d",wParam); ! MessageBox(NULL,mess,"keydown",MB_OK); ! } #endif *************** *** 467,471 **** --- 498,535 ---- } + // Added By Roozbeh + static int + handleZoominoutdown(HWND hwMain, int z) { + + + // Added By Roozbeh + short delta = 100; + + if (whatToDraw == LINES || whatToDraw == BLOCKS) { + + /* Zoom in By pressing the Add button. + * zoom out By pressing the Subtract button. + */ + switch (z) + { + + case (0): + zoom = (long)floor(zoom*1.2); + break; + + case (1): + zoom = (long)floor(zoom/1.2); + break; + } + + + } + InvalidateRect(hwMain, NULL, TRUE); + UpdateWindow(hwMain); + + return 0; + } + //Added By Roozbeh *************** *** 633,638 **** filepath.gfile[0] = '\0'; //sprintf(mainWinTitle, "%s for Windows 95/NT", (LPSTR) szAppName); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain,NULL,NULL); dda_set_menu_state(dda,GEOM_STATE | ABORTED); --- 697,704 ---- filepath.gfile[0] = '\0'; //sprintf(mainWinTitle, "%s for Windows 95/NT", (LPSTR) szAppName); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain,NULL,NULL); ! dda_set_menu_state(dda,GEOM_STATE | ABORTED); *************** *** 656,660 **** //sprintf(mainWinTitle, "%s for Windows 95/NT", (LPSTR) szAppName); //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain,NULL,NULL); hInst = (HINSTANCE) GetWindowLong(hwMain, GWL_HINSTANCE); --- 722,727 ---- //sprintf(mainWinTitle, "%s for Windows 95/NT", (LPSTR) szAppName); //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain,NULL,NULL); ! hInst = (HINSTANCE) GetWindowLong(hwMain, GWL_HINSTANCE); *************** *** 666,671 **** { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); } --- 733,740 ---- { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); ! } *************** *** 693,698 **** { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); if (strcmp(filepath.gfile, filepath.oldfile) != 0 && MessageBox(hwMain, "Apply geometry?", "GEOMETRY", MB_YESNO) == IDYES) --- 762,769 ---- { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); ! if (strcmp(filepath.gfile, filepath.oldfile) != 0 && MessageBox(hwMain, "Apply geometry?", "GEOMETRY", MB_YESNO) == IDYES) *************** *** 723,727 **** //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, (LPSTR) filepath.gfile); //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); dda_set_menu_state(dda,GEOM_STATE); --- 794,799 ---- //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", (LPSTR) szAppName, (LPSTR) filepath.gfile); //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); ! dda_set_menu_state(dda,GEOM_STATE); *************** *** 819,829 **** else { ! ! // TODO: Find a way to handle both Geometry and Analysis files ! // with a titlebar call. //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", (LPSTR) szAppName, (LPSTR) filepath.gfile, (LPSTR) filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); //updateMainMenu(hwMain, anastate*readystate); --- 891,907 ---- else { ! ! ! // TODO: Find a way to handle both Geometry and Analysis files ! ! // with a titlebar call. ! //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", (LPSTR) szAppName, (LPSTR) filepath.gfile, (LPSTR) filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! ! ! set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); ! //updateMainMenu(hwMain, anastate*readystate); *************** *** 943,952 **** Geometrydata * geomdata = dda_get_geometrydata(dda); strcpy(filepath.oldfile, filepath.afile); ! filepath.afile[0] = '\0'; ! hInst = (HINSTANCE) GetWindowLong(hwMain, GWL_HINSTANCE); //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); if (!DialogBoxParam(hInst, "ANALDLG2", hwMain, (DLGPROC)AnalDlgProc,(LPARAM)geomdata )) --- 1021,1034 ---- Geometrydata * geomdata = dda_get_geometrydata(dda); strcpy(filepath.oldfile, filepath.afile); ! filepath.afile[0] = '\0'; ! ! hInst = (HINSTANCE) GetWindowLong(hwMain, GWL_HINSTANCE); ! //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s", LPSTR) szAppName, filepath.gfile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain, "Geometry",filepath.gfile); ! if (!DialogBoxParam(hInst, "ANALDLG2", hwMain, (DLGPROC)AnalDlgProc,(LPARAM)geomdata )) *************** *** 955,962 **** } ! if(filepath.afile[0] != '\0') { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", (LPSTR) szAppName, filepath.gfile, filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); --- 1037,1046 ---- } ! if(filepath.afile[0] != '\0') { ! //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", (LPSTR) szAppName, filepath.gfile, filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); *************** *** 988,996 **** //iface->setdisplay((unsigned int)hwMain); ! if(filepath.afile[0] != '\0') { //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", LPSTR) szAppName, filepath.gfile, filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); if (MessageBox(hwMain, "Run analysis?", "ANALYSIS", MB_YESNO) == IDYES) --- 1072,1083 ---- //iface->setdisplay((unsigned int)hwMain); ! if(filepath.afile[0] != '\0') { ! //sprintf(mainWinTitle, "%s for Windows 95/NT --- Geometry = %s, Analysis File = %s", LPSTR) szAppName, filepath.gfile, filepath.afile); ! //SetWindowText(hwMain, (LPCTSTR) mainWinTitle); ! ! set_mainwindow_titlebar(hwMain, "Analysis",filepath.afile); ! if (MessageBox(hwMain, "Run analysis?", "ANALYSIS", MB_YESNO) == IDYES) *************** *** 1738,1743 **** DDA * dda = (DDA *)GetWindowLong(hwMain,GWL_USERDATA); ! LPCTSTR szFilter[] = {"Autocad Dxf files (*.dxf)\0*.dxf\0All files (*.*)\0*.*\0\0"}; ! // TODO: Add a dxf file type for this, instead of shoving into the geometry file. // That way, the dxf file can be modified independently at a future date. fileBrowse(hwMain, &ofn, szFilter, filepath.gpath, filepath.gfile, "dxf"); --- 1825,1832 ---- DDA * dda = (DDA *)GetWindowLong(hwMain,GWL_USERDATA); ! LPCTSTR szFilter[] = {"Autocad Dxf files (*.dxf)\0*.dxf\0All files (*.*)\0*.*\0\0"}; ! ! // TODO: Add a dxf file type for this, instead of shoving into the geometry file. ! // That way, the dxf file can be modified independently at a future date. fileBrowse(hwMain, &ofn, szFilter, filepath.gpath, filepath.gfile, "dxf"); *************** *** 1746,1751 **** strcpy(filepath.gpath, filepath.oldpath); return 0; /* user pressed cancel */ ! } ! set_mainwindow_titlebar(hwMain,"DXF",filepath.gfile); --- 1835,1842 ---- strcpy(filepath.gpath, filepath.oldpath); return 0; /* user pressed cancel */ ! } ! ! ! set_mainwindow_titlebar(hwMain,"DXF",filepath.gfile); *************** *** 1761,1771 **** // The dxf file will be read from this line and lines, polylines // and arcs will be recognized from dxf file ! fp1 = fopen(filepath.gfile,"r"); // WARNING: This overwrites the name of the currently open file fp1! strcpy (filepath.gfile, strcat (filepath.rootname, ".geo")); dxf_read_file(fp1,filepath.gfile); ! ! // Send message to GeomApply to have geometry automatically loaded. ! SendMessage(hwMain, WM_COMMAND, GEOM_APPLY, lParam); return 1; --- 1852,1866 ---- // The dxf file will be read from this line and lines, polylines // and arcs will be recognized from dxf file ! fp1 = fopen(filepath.gfile,"r"); ! // WARNING: This overwrites the name of the currently open file fp1! strcpy (filepath.gfile, strcat (filepath.rootname, ".geo")); dxf_read_file(fp1,filepath.gfile); ! ! ! // Send message to GeomApply to have geometry automatically loaded. ! ! SendMessage(hwMain, WM_COMMAND, GEOM_APPLY, lParam); ! return 1; *************** *** 1938,1943 **** handleAPWEDGE(hwMain); break; ! case DDAHELP_OVERVIEW: case DDAHELP_INDEX: case DDAHELP_GEOMETRY: --- 2033,2046 ---- handleAPWEDGE(hwMain); break; + // Added By Roozbeh + case TOOLBAR_ZOOMOUT: + handleZoominoutdown(hwMain,0); + break; + case TOOLBAR_ZOOMIN: + handleZoominoutdown(hwMain,1); + break; + // Added By Roozbeh ! case DDAHELP_OVERVIEW: case DDAHELP_INDEX: case DDAHELP_GEOMETRY: *************** *** 2127,2131 **** hddawin = CreateWindowEx(WS_EX_ACCEPTFILES, ! szAppName, szAppName, WS_OVERLAPPEDWINDOW | --- 2230,2235 ---- hddawin = CreateWindowEx(WS_EX_ACCEPTFILES, ! szAppName, ! szAppName, WS_OVERLAPPEDWINDOW | |
|
From: Roozbeh <rgr...@us...> - 2007-11-27 02:42:48
|
Update of /cvsroot/dda/ntdda/src/win32gui In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv3057 Modified Files: toolbar.c Log Message: Enabling the zoomin and zoomout toolbar icon Index: toolbar.c =================================================================== RCS file: /cvsroot/dda/ntdda/src/win32gui/toolbar.c,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** toolbar.c 26 May 2002 23:47:27 -0000 1.2 --- toolbar.c 27 Nov 2007 02:42:40 -0000 1.3 *************** *** 88,91 **** --- 88,93 ---- toolbar_send_message(hToolBar,ANAL_BROWSE,TBSTATE_ENABLED); toolbar_send_message(hToolBar,ANAL_NEW, TBSTATE_ENABLED); + toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh break; *************** *** 97,100 **** --- 99,105 ---- toolbar_send_message(hToolBar,ANAL_BROWSE,0); toolbar_send_message(hToolBar,ANAL_NEW, 0); + toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, 0); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, 0); //Added by Roozbeh + break; *************** *** 106,109 **** --- 111,117 ---- toolbar_send_message(hToolBar,ANAL_NEW, TBSTATE_ENABLED); toolbar_send_message(hToolBar,ANAL_ABORT, 0); + toolbar_send_message(hToolBar,TOOLBAR_ZOOMOUT, TBSTATE_ENABLED); //Added by Roozbeh + toolbar_send_message(hToolBar,TOOLBAR_ZOOMIN, TBSTATE_ENABLED); //Added by Roozbeh + break; *************** *** 128,132 **** {0, GEOM_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, {1, ANAL_NEW, 0, TBSTYLE_BUTTON, 0, 0}, ! {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, {2, GEOM_BROWSE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, {3, ANAL_BROWSE, 0, TBSTYLE_BUTTON, 0, 0}, --- 136,140 ---- {0, GEOM_NEW, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, {1, ANAL_NEW, 0, TBSTYLE_BUTTON, 0, 0}, ! {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, {2, GEOM_BROWSE, TBSTATE_ENABLED, TBSTYLE_BUTTON, 0, 0}, {3, ANAL_BROWSE, 0, TBSTYLE_BUTTON, 0, 0}, *************** *** 134,141 **** //{4, GEOM_NEW, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0}, {5, GEOM_APPLY, 0, TBSTYLE_BUTTON, 0, 0}, ! {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, ! //{6, TOOLBAR_ZOOMIN, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0}, ! //{7, TOOLBAR_ZOOMOUT, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0}, ! {6, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} //{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, //{9, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} --- 142,149 ---- //{4, GEOM_NEW, TBSTATE_ENABLED, TBSTYLE_CHECK, 0, 0}, {5, GEOM_APPLY, 0, TBSTYLE_BUTTON, 0, 0}, ! {0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, ! {7, TOOLBAR_ZOOMOUT, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh ! {8, TOOLBAR_ZOOMIN, 0, TBSTYLE_BUTTON, 0, 0}, //Enabled by Roozbeh ! //{6, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} //{0, 0, TBSTATE_ENABLED, TBSTYLE_SEP, 0L, -1}, //{9, TOOLBAR_PRINT, 0, TBSTYLE_BUTTON, 0, 0} |
|
From: Roozbeh <rgr...@us...> - 2007-02-09 08:09:29
|
Update of /cvsroot/dda/pub/mohrcoloumb In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv10175 Modified Files: mohrcoulomb_rev.tex Log Message: some changes in Abs.,intro. and verification section as well as table Index: mohrcoulomb_rev.tex =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/mohrcoulomb_rev.tex,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mohrcoulomb_rev.tex 16 Jan 2007 15:04:14 -0000 1.3 --- mohrcoulomb_rev.tex 9 Feb 2007 08:09:25 -0000 1.4 *************** *** 125,142 **** validity of nonlinear discontinuous deformation analysis (DDA) by comparing its solution for circular tunnel with analytical solutions ! (Salencon solution). The absolute error in the DDA computed displacements is very small, and the relative error diverges slowly with distance from the analytical solution. Overall, absolute and relative errors between the DDA results and the Salencon solution ! indicate that DDA is accurate enough for solving practical engineering ! problems over time steps ranging from 0.1 to 0.001 seconds, ! The proposed model is then used to analyze the excavation problem of the pilot of Lavarak power station cavern located in Iran and the results are compared to data collected from extensometes installed in the Lavarack ! cavern pilot tunnel. The relative error between the ! simulation and the collected data ranges from 3\% near the ! cavern free surface, to 18\% at the end of the 7 meter ! extensometer. \end{abstract} --- 125,141 ---- validity of nonlinear discontinuous deformation analysis (DDA) by comparing its solution for circular tunnel with analytical solutions ! (Salencon solution), compare the results with those from referred commercial ! software (FLAC). The absolute error in the DDA computed displacements is very small, and the relative error diverges slowly with distance from the analytical solution. Overall, absolute and relative errors between the DDA results and the Salencon solution ! as well as commercial software indicate that DDA is accurate enough for solving practical engineering ! problems, The proposed model is then used to analyze the excavation problem of the pilot of Lavarak power station cavern located in Iran and the results are compared to data collected from extensometes installed in the Lavarack ! cavern pilot tunnel. Same model has been analyzed using FLAC. ! The relative error between the simulation and the collected data ranges from 3\% near the ! cavern free surface, to 18\% at the end of the 7 meter extensometer. \end{abstract} *************** *** 228,235 **** tunnel for the Lavarak powerhouse near Tehran, Iran, show that DDA predicts displacements within 3\% near the cavity to 18\% at 5 meters ! from the free surface. The growth of relative error away from the ! free surface is attributed to the effect of the mesh coarsening with ! distance and the effect of boundary condition. ! \section{DISPLACEMENT APPROXIMATIONS} --- 227,240 ---- tunnel for the Lavarak powerhouse near Tehran, Iran, show that DDA predicts displacements within 3\% near the cavity to 18\% at 5 meters ! from the free surface. ! The further illustrate, the capabilities of the modified DDA, ! a commercial FDM (e.g. finite difference method) code, FLAC computer program, ! which is an explicit two-dimensional stress analysis code program developed by ! Itasca ~\cite{flac:fm1998} was used for the numerical simulation in both verifications. ! %The growth of relative error away from the free surface is attributed to the effect of the mesh coarsening with ! %distance and the effect of boundary condition. ! Through comparisons of numerical results with analytical solution in two excavation ! examples, it is demonstrated that modified DDA is correct and can produce very good results for elastoplastic ! problems. \section{DISPLACEMENT APPROXIMATIONS} *************** *** 703,728 **** - %\begin{figure} - %\begin{center} - %\subfigure[DDA model of a circular tunnel in an infinite Mohr-Coulomb medium.] - %{\label{subfig:initial_mesh} - %\includegraphics[width=2.5in]{figs/mesh.eps}} - %\subfigure[Shaded region shows plastic zone around circular tunnel.] - %{\label{subfig:deformed_mesh} - %\includegraphics[width=2.5in]{figs/plastic_zone_tunnel.eps}} - %\caption{DDA model of a circular tunnel in an infinite Mohr-Coulomb medium} - %\label{fig:mesh} - %\end{center} - %\end{figure} - \begin{figure} \begin{center} ! \includegraphics[width=3.5in]{figs/plastic_zone_tunnel.eps} ! \caption{DDA model of a circular tunnel in an infinite Mohr-Coulomb medium. ! Shaded region shows plastic zone around circular tunnel.} ! \label{fig:mesh} \end{center} \end{figure} --- 708,734 ---- \begin{figure} \begin{center} ! \subfigure[] ! {\label{subfig:flac_mesh} ! \includegraphics[width=3.6in]{figs/flac_circular_tunnel_plastic.eps}} ! \subfigure[] ! {\label{subfig:dda_mesh} ! \includegraphics[width=2.5in]{figs/plastic_zone_tunnel.eps}} ! \caption{FLAC (a) and DDA (b) model of a circular tunnel in an infinite Mohr-Coulomb medium ! (Shaded region shows plastic zone around circular tunnel)} ! \label{fig:dda_mesh} \end{center} \end{figure} + %\begin{figure} + %\begin{center} + %\includegraphics[width=3.5in]{figs/plastic_zone_tunnel.eps} + %\caption{DDA model of a circular tunnel in an infinite Mohr-Coulomb medium. + %Shaded region shows plastic zone around circular tunnel.} + %\label{fig:dda_mesh} + %\end{center} + %\end{figure} + *************** *** 740,746 **** 5000 MPa, Poison's Ratio= 0.2 and Hole Radius= 1 m, Cohesion=0.5 MPa, Friction angle = 30° and Dilation angle = 0° The ! calculated radius of plastic zone by close form solution is 2.2 m ! that radius of plastic zone that obtained by new code of DDA is ! approximately 2 m shown in Figure ~\ref{fig:mesh}. --- 746,753 ---- 5000 MPa, Poison's Ratio= 0.2 and Hole Radius= 1 m, Cohesion=0.5 MPa, Friction angle = 30° and Dilation angle = 0° The ! calculated radius of plastic zone by close form solution is 2.5 m ! that radius of plastic zone that obtained by new code of DDA and FLAC is ! approximately 2.4 and 2.7 m respectively, shown in Figure ~\ref{subfig:flac_mesh} ! and Figure ~\ref{subfig:dda_mesh} . *************** *** 762,779 **** Figure~\ref{fig:circular_tunnel_results} shows a direct comparison between new DDA ! code results and analytical solution along a radial line. ! To investigate whether the error is affected by different time step, a ! set of experiments was performed with 0.001s, 0.01s, and 0.1s. With ! regard to the obtained results, the modified DDA results are in good ! agreement with the analytical solution. At a distance of about 5 m ! from the opening wall the DDA solution slightly diverges from the ! analytical solution. This is due to not only for a very coarse mesh ! used in this area but also for effecting of boundary condition. The ! behavior like this has been reported by Grayeli and ! Mortazavi~\cite{grayeli:r2005} in modeling at infinite elastic medium ! with \textit{Phase}$^{2}$ % We need a reference for Phase 2 %(the powerful 2D elastoplastic finite element stress analysis %program for underground or surface excavations in rock). The error distribution throughout the entire elements are also presented. Figures~\ref{subfig:displacement} and --- 769,788 ---- Figure~\ref{fig:circular_tunnel_results} shows a direct comparison between new DDA ! code results and analytical solution as well as FLAC along a radial line. ! % To investigate whether the error is affected by different time step, a ! % set of experiments was performed with 0.001s, 0.01s, and 0.1s. ! With regard to the obtained results, the modified DDA results are in good ! agreement with FLAC and analytical solution. ! %At a distance of about 5 m from the opening wall the DDA solution slightly diverges from the ! %analytical solution. This is due to not only for a very coarse mesh ! %used in this area but also for effecting of boundary condition. The ! %behavior like this has been reported by Grayeli and ! %Mortazavi~\cite{grayeli:r2005} in modeling at infinite elastic medium ! %with \textit{Phase}$^{2}$ ! % We need a reference for Phase 2 %(the powerful 2D elastoplastic finite element stress analysis %program for underground or surface excavations in rock). + The error distribution throughout the entire elements are also presented. Figures~\ref{subfig:displacement} and *************** *** 843,851 **** Figure~\ref{fig:lavarak} shows the plastic zones in the rock mass surrounding the Lavarak powerhouse. Plastic zones extend approximately ! 6 m in the wall and roof. The further illustrate the capabilities of the modified DDA, ! a commercial FDM (e.g. finite difference method) code, FLAC computer program, ! which is an explicit two-dimensional stress analysis code program developed by ! Itasca ~\cite{flac:fm1998} was used for the numerical simulation. The model grid and its boundary ! conditions used in the analysis are shown in Figure~\ref{fig:flac_lavarak_grid}. As can be seen from Figure~\ref{fig:flac-lavarak-plastic-zone} and Table~\ref{tab:results}, plastic zone and displacement by FLAC and modified DDA for the pilot tunnel are in very close --- 852,857 ---- Figure~\ref{fig:lavarak} shows the plastic zones in the rock mass surrounding the Lavarak powerhouse. Plastic zones extend approximately ! 6 m in the wall and roof. The model grid and its boundary ! conditions used in the analysis by FLAC are shown in Figure~\ref{fig:flac_lavarak_grid}. As can be seen from Figure~\ref{fig:flac-lavarak-plastic-zone} and Table~\ref{tab:results}, plastic zone and displacement by FLAC and modified DDA for the pilot tunnel are in very close *************** *** 853,857 **** rock movements obtained from the DDA are the same or similar at the monitoring points. For example, the maximum error of the tunnel ! obtained from DDA is in the order of 0.2535 m. --- 859,863 ---- rock movements obtained from the DDA are the same or similar at the monitoring points. For example, the maximum error of the tunnel ! obtained from DDA is in the order of 1.014 mm. *************** *** 943,951 **** \begin{tabular}{|l|p{55pt}|p{55pt}|p{55pt}|p{55pt}|}\hline & \multicolumn{4}{|p{200pt}|}{Distance from tunnel boundary}\\\hline ! Model& 0 m& 1.5 m& 3 m& 5 m \\\hline ! In situ (mm)& 8 & 4& 1.7& 1 \\\hline ! DDA (mm)& 7.724& 2.986& 1.628& 0.823 \\\hline ! FLAC (mm)& 9.77& 4.37& 2.26& 0.9 \\\hline ! Relative error& 0.0345 & 0.2535 & 0.04235 & 0.177 \\\hline \end{tabular} \caption{Displacements at monitoring points and error analysis} --- 949,958 ---- \begin{tabular}{|l|p{55pt}|p{55pt}|p{55pt}|p{55pt}|}\hline & \multicolumn{4}{|p{200pt}|}{Distance from tunnel boundary}\\\hline ! Model (mm)& 0 m& 1.5 m& 3 m& 5 m \\\hline ! In situ & 8 & 4& 1.7& 1 \\\hline ! DDA & 7.724& 2.986& 1.628& 0.823 \\\hline ! FLAC & 9.77& 4.37& 2.26& 0.9 \\\hline ! Absolute error(DDA)& 0.276 & 1.014 & 0.072 & 0.177 \\\hline ! Absolute error(FLAC)& 1.77 & 0.37 & 0.56 & 0.1 \\\hline \end{tabular} \caption{Displacements at monitoring points and error analysis} |
|
From: Roozbeh <rgr...@us...> - 2007-02-09 08:06:56
|
Update of /cvsroot/dda/pub/mohrcoloumb/figs In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv8131 Modified Files: abs_error.eps abserror.eps disp.eps displacement.eps relerror.eps Added Files: flac_circular_tunnel_plastic.eps Log Message: Added new flac model of circular tunnel Index: displacement.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/displacement.eps,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsGAYo30 and /tmp/cvszgBlMx differ Index: abserror.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/abserror.eps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** abserror.eps 29 Nov 2006 15:23:14 -0000 1.1 --- abserror.eps 9 Feb 2007 08:06:52 -0000 1.2 *************** *** 1,601 **** ! %!PS-Adobe-2.0 EPSF-2.0 ! %%Title: abserror.eps ! %%Creator: gnuplot 4.0 patchlevel 0 ! %%CreationDate: Wed Nov 15 23:56:18 2006 ! %%DocumentFonts: (atend) ! %%BoundingBox: 50 50 230 176 ! %%Orientation: Portrait ! %%EndComments ! /gnudict 256 dict def ! gnudict begin [...1024 lines suppressed...] ! gs 4569 728 147 147 MR c np ! 36 36 4642 801 FO ! gr ! ! gr ! ! c9 ! ! end ! ! eplot ! %%EndObject ! ! epage ! end ! ! showpage ! ! %%Trailer ! %%EOF Index: abs_error.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/abs_error.eps,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvswJAl14 and /tmp/cvsrCotYB differ Index: disp.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/disp.eps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** disp.eps 29 Nov 2006 15:23:14 -0000 1.1 --- disp.eps 9 Feb 2007 08:06:52 -0000 1.2 *************** *** 1,686 **** ! %!PS-Adobe-2.0 EPSF-2.0 ! %%Title: disp.eps ! %%Creator: gnuplot 4.0 patchlevel 0 ! %%CreationDate: Wed Nov 15 23:56:18 2006 ! %%DocumentFonts: (atend) ! %%BoundingBox: 50 50 230 176 ! %%Orientation: Portrait ! %%EndComments ! /gnudict 256 dict def ! gnudict begin [...1103 lines suppressed...] ! gs 4723 877 147 147 MR c np ! 36 36 4796 950 FO ! gr ! ! gr ! ! c10 ! ! end ! ! eplot ! %%EndObject ! ! epage ! end ! ! showpage ! ! %%Trailer ! %%EOF Index: relerror.eps =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/figs/relerror.eps,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** relerror.eps 29 Nov 2006 15:23:14 -0000 1.1 --- relerror.eps 9 Feb 2007 08:06:52 -0000 1.2 *************** *** 1,651 **** ! %!PS-Adobe-2.0 EPSF-2.0 ! %%Title: relerror.eps ! %%Creator: gnuplot 4.0 patchlevel 0 ! %%CreationDate: Wed Nov 15 23:56:19 2006 ! %%DocumentFonts: (atend) ! %%BoundingBox: 50 50 230 176 ! %%Orientation: Portrait ! %%EndComments ! /gnudict 256 dict def ! gnudict begin [...1064 lines suppressed...] ! gs 4576 676 147 147 MR c np ! 36 36 4649 749 FO ! gr ! ! gr ! ! c9 ! ! end ! ! eplot ! %%EndObject ! ! epage ! end ! ! showpage ! ! %%Trailer ! %%EOF --- NEW FILE: flac_circular_tunnel_plastic.eps --- %!PS-Adobe-3.0 EPSF-3.0 %%Title: (Flac_Plastic Model \(1\)) %%Version: 1 3 %%Creator: (PScript5.dll Version 5.2.2) %%CreationDate: (D:20070207195858+03'30') %%For: (Rock) %%DocumentData: Clean7Bit %%BoundingBox: 0 0 792 612 %%Pages: 0 %%DocumentProcessColors: Cyan Magenta Yellow Black %%DocumentSuppliedResources: %%+ procset (Adobe Acrobat - PDF operators) 1.2 0 %%EndComments 0 0 moveto 792 0 lineto 792 612 lineto 0 612 lineto closepath clip newpath %%BeginProlog %%EndProlog %%BeginSetup /currentpacking where{pop currentpacking true setpacking}if %%BeginResource: procset pdfvars [...24649 lines suppressed...] 215.52 666.78 l 214.92 665.52 l 214.56 664.14 l 214.44 662.76 l 214.56 661.32 l 214.92 660 l 215.52 658.68 l 216.36 657.54 l 217.32 656.52 l 218.52 655.74 l 219.78 655.14 l 221.16 654.78 l 222.54 654.66 l h S PDFVars/TermAll get exec end end %%PageTrailer %%EndPage %%Trailer %%EOF |
|
From: Roozbeh <rgr...@us...> - 2007-01-16 15:04:19
|
Update of /cvsroot/dda/pub/mohrcoloumb In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26543 Modified Files: mohrcoulomb_rev.tex Log Message: Parameters to model circular tunnel have been improved Index: mohrcoulomb_rev.tex =================================================================== RCS file: /cvsroot/dda/pub/mohrcoloumb/mohrcoulomb_rev.tex,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mohrcoulomb_rev.tex 29 Nov 2006 14:12:38 -0000 1.2 --- mohrcoulomb_rev.tex 16 Jan 2007 15:04:14 -0000 1.3 *************** *** 738,746 **** The input data used in the DDA analysis are as below: Young modulus= ! 6777.93 MPa, Poison's Ratio= 0.2103448 and Hole Radius= 1 m, ! Cohesion=3.45 MPa, Friction angle = 30° and Dilation angle = 0° The ! calculated radius of plastic zone by close form solution is 1.17 m that radius of plastic zone that obtained by new code of DDA is ! approximately 1.18 m shown in Figure ~\ref{fig:mesh}. --- 738,746 ---- The input data used in the DDA analysis are as below: Young modulus= ! 5000 MPa, Poison's Ratio= 0.2 and Hole Radius= 1 m, ! Cohesion=0.5 MPa, Friction angle = 30° and Dilation angle = 0° The ! calculated radius of plastic zone by close form solution is 2.2 m that radius of plastic zone that obtained by new code of DDA is ! approximately 2 m shown in Figure ~\ref{fig:mesh}. |
