dda-cvs — cvs mailing list for dda project

[Dda-cvs] ntdda ntdda.dsp,1.42,1.43

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12677

Modified Files:
	ntdda.dsp 
Log Message:
Added rb tree.

Index: ntdda.dsp
===================================================================
RCS file: /cvsroot/dda/ntdda/ntdda.dsp,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** ntdda.dsp	28 Jul 2006 15:44:06 -0000	1.42
--- ntdda.dsp	31 Jul 2006 02:15:28 -0000	1.43
***************
*** 191,195 ****
  # Begin Source File
  
! SOURCE=.\src\win32gui\drawdialog3.c
  # End Source File
  # Begin Source File
--- 191,195 ----
  # Begin Source File
  
! SOURCE=.\src\win32gui\drawdialog.c
  # End Source File
  # Begin Source File
***************
*** 308,311 ****
--- 308,315 ----
  # Begin Source File
  
+ SOURCE=.\src\rb.c
+ # End Source File
+ # Begin Source File
+ 
  SOURCE=.\include\resource.h
  # End Source File

[Dda-cvs] ntdda/include rb.h,NONE,1.1

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/include
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv12284

Added Files:
	rb.h 
Log Message:
Added rb tree.

--- NEW FILE: rb.h ---
/*
Generic C code for red-black trees.
Copyright (C) 2000 James S. Plank

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */

/* Revision 1.2.  Jim Plank */

/* Original code by Jim Plank (pl...@cs...) */
/* modified for THINK C 6.0 for Macintosh by Chris Bartley */


#ifndef RB_H
#define RB_H

#ifdef __cplusplus
extern "C" {
#endif
#if 0
}
#endif



typedef struct {

  unsigned red : 1 ;
  unsigned internal : 1 ;
  unsigned left : 1 ;
  unsigned root : 1 ;
  unsigned head : 1 ;
} status;
 

/* Main rb_node.  You only ever use the fields

   c.list.flink
   c.list.blink

   k.key or k.ikey
   v.val
*/
typedef struct rb_node {

  union {
    struct {
      struct rb_node *flink;
      struct rb_node *blink;
    } list;
    struct {
      struct rb_node *left;
      struct rb_node *right;
    } child;
  } c;
  union {
    struct rb_node *parent;
    struct rb_node *root;
  } p;
  status s;
  union {
    int ikey;
    char *key;
    struct rb_node *lext;
  } k;
  union {
    char *val;
    struct rb_node *rext;
  } v;
} *Rb_node;


extern Rb_node make_rb        (void);   /* Creates a new rb-tree */

extern Rb_node rb_new         (void);

/* Creates a node with key key and val val and inserts it into the tree.
   rb_insert uses strcmp() as comparison funcion.  rb_inserti uses <>=,
   rb_insertg uses func() */
extern Rb_node rb_insert      (Rb_node tree, 
                               char * key, 
                               void * val);

extern Rb_node rb_inserti     (Rb_node tree, 
                               int ikey, 
                               void * val);


extern Rb_node rb_insertg     (Rb_node tree, 
                               char * key, 
                               void * val,
                               int (*func)(char *, char *));


/* returns an external node in t whose value is equal
  k or whose value is the smallest value greater than k. */
extern Rb_node rb_find_key    (Rb_node root, 
                               char * key);


extern Rb_node rb_find_ikey   (Rb_node root, 
                               int ikey);


extern Rb_node rb_find_gkey   (Rb_node root, 
                               char *key, 
                               int (*func)(char *, char *));


/* Works just like the find_key versions only it returns whether or not
   it found the key in the integer variable found */
extern Rb_node rb_find_key_n  (Rb_node root, 
                               char *key, 
                               int *found);

extern Rb_node rb_find_ikey_n (Rb_node root, 
                               int ikey, 
                               int *found);


extern Rb_node rb_find_gkey_n (Rb_node root, 
                               char *key, 
                               int (*func)(char *, char *), 
                               int *found);


/* Creates a node with key key and val val and inserts it into the 
   tree before/after node nd.  Does not check to ensure that you are 
   keeping the correct order */
extern Rb_node rb_insert_b    (Rb_node nd, 
                               char *key, 
                               char *val);

extern Rb_node rb_insert_a    (Rb_node nd, 
                               char *key, 
                               char *val);


extern void rb_delete_node    (Rb_node node);  /* Deletes and frees a node (but 
                                              not the key or val) */

extern void rb_free_tree      (Rb_node root);  /* Deletes and frees an entire tree */


extern char *rb_val           (Rb_node node);  /* Returns node->v.val -- this is to shut
                                                  lint up */


extern int rb_nblack(Rb_node n); /* returns # of black nodes in path from
                                    n to the root */


int rb_plength(Rb_node n);       /* returns the # of nodes in path from
				    n to the root */

void rb_print_tree            (Rb_node t, 
                               int level);

void rb_print_ordered         (Rb_node t, 
                               int level);

 
#define rb_first(n) (n->c.list.flink)
#define rb_last(n) (n->c.list.blink)
#define rb_next(n) (n->c.list.flink)
#define rb_prev(n) (n->c.list.blink)
#define rb_empty(t) (t->c.list.flink == t)

#ifndef rb_nil
#define rb_nil(t) (t)
#endif
 
#define rb_traverse(ptr, lst) \
  for(ptr = rb_first(lst); ptr != rb_nil(lst); ptr = rb_next(ptr))
 

#ifdef __cplusplus
}
#endif

#endif  /* RB_H */

[Dda-cvs] ntdda/src rb.c,NONE,1.1

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv11918

Added Files:
	rb.c 
Log Message:
Added rb tree.

--- NEW FILE: rb.c ---
/*
Generic C code for red-black trees.
Copyright (C) 2000 James S. Plank

This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
/* Revision 1.2.  Jim Plank */

/* Original code by Jim Plank (pl...@cs...) */
/* modified for THINK C 6.0 for Macintosh by Chris Bartley */

#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>

#include "rb.h"

#ifdef __cplusplus
extern "C" {
#endif
#if 0
}
#endif


static void mk_new_int(Rb_node l, Rb_node r, Rb_node p, int il);
static Rb_node lprev(Rb_node n);
static Rb_node rprev(Rb_node n);
static void recolor(Rb_node n);
static void single_rotate(Rb_node y, int l);
//static void rb_print_tree(Rb_node t, int level);
static void rb_iprint_tree(Rb_node t, int level);


#define isred(n) (n->s.red)
#define isblack(n) (!isred(n))
#define isleft(n) (n->s.left)
#define isright(n) (!isleft(n))
#define isint(n) (n->s.internal)
#define isext(n) (!isint(n))
#define ishead(n) (n->s.head)
#define isroot(n) (n->s.root)
#define setred(n) n->s.red = 1
#define setblack(n) n->s.red = 0
#define setleft(n) n->s.left = 1
#define setright(n) n->s.left = 0
#define sethead(n) n->s.head = 1
#define setroot(n) n->s.root = 1
#define setint(n) n->s.internal = 1
#define setext(n) n->s.internal = 0
#define setnormal(n) { n->s.root = 0; n ->s.head = 0; }
#define sibling(n) ((isleft(n)) ? n->p.parent->c.child.right \
                                : n->p.parent->c.child.left)

/* Inserts to the end of a list */
static
void insert(Rb_node item, Rb_node list) {

  Rb_node last_node;

  last_node = list->c.list.blink;

  list->c.list.blink = item;
  last_node->c.list.flink = item;
  item->c.list.blink = last_node;
  item->c.list.flink = list;
}


/* Deletes an arbitrary iterm */
static
void delete_item(Rb_node item) {

  item->c.list.flink->c.list.blink = item->c.list.blink;
  item->c.list.blink->c.list.flink = item->c.list.flink;
}

#define mk_new_ext(new, kkkey, vvval) {\
  new = (Rb_node) malloc(sizeof(struct rb_node));\
  new->v.val = vvval;\
  new->k.key = kkkey;\
  setext(new);\
  setblack(new);\
  setnormal(new);\
}

static
void mk_new_int(Rb_node l, Rb_node r, Rb_node p, int il) {

  Rb_node newnode;

  newnode = (Rb_node) malloc(sizeof(struct rb_node));
  setint(newnode);
  setred(newnode);
  setnormal(newnode);
  newnode->c.child.left = l;
  newnode->c.child.right = r;
  newnode->p.parent = p;
  newnode->k.lext = l;
  newnode->v.rext = r;
  l->p.parent = newnode;
  r->p.parent = newnode;
  setleft(l);
  setright(r);
  if (ishead(p)) {
    p->p.root = newnode;
    setroot(newnode);
  } else if (il) {
    setleft(newnode);
    p->c.child.left = newnode;
  } else {
    setright(newnode);
    p->c.child.right = newnode;
  }
  recolor(newnode);
}


Rb_node
lprev(Rb_node n) {

  if (ishead(n)) return n;
  while (!isroot(n)) {
    if (isright(n)) return n->p.parent;
    n = n->p.parent;
  }
  return n->p.parent;
}


Rb_node
rprev(Rb_node n) {

  if (ishead(n)) return n;
  while (!isroot(n)) {
    if (isleft(n)) return n->p.parent;
    n = n->p.parent;
  }
  return n->p.parent;
}

Rb_node
make_rb() {

  Rb_node head;

  head = (Rb_node) malloc (sizeof(struct rb_node));
  head->c.list.flink = head;
  head->c.list.blink = head;
  head->p.root = head;
  head->k.key = "";
  sethead(head);
  return head;
}


Rb_node
rb_new(void) {

   return make_rb();
}


Rb_node
rb_find_key_n(Rb_node n, char *key, int *fnd) {

  int cmp;

  *fnd = 0;
  if (!ishead(n)) {
    fprintf(stderr, "rb_find_key_n called on non-head 0x%x\n", n);
    exit(1);
  }
  if (n->p.root == n) return n;
  cmp = strcmp(key, n->c.list.blink->k.key);
  if (cmp == 0) {
    *fnd = 1;
    return n->c.list.blink;
  }
  if (cmp > 0) return n;
  else n = n->p.root;
  while (1) {
    if (isext(n)) return n;
    cmp = strcmp(key, n->k.lext->k.key);
    if (cmp == 0) {
      *fnd = 1;
      return n->k.lext;
    }
    if (cmp < 0) n = n->c.child.left ; else n = n->c.child.right;
  }
}

Rb_node
rb_find_key(Rb_node n, char *key) {

  int fnd;
  return rb_find_key_n(n, key, &fnd);
}

Rb_node
rb_find_ikey_n(Rb_node n, int ikey, int *fnd) {

  *fnd = 0;
  if (!ishead(n)) {
    fprintf(stderr, "rb_find_ikey_n called on non-head 0x%x\n", n);
    exit(1);
  }
  if (n->p.root == n) return n;
  if (ikey == n->c.list.blink->k.ikey) {
    *fnd = 1;
    return n->c.list.blink;
  }
  if (ikey > n->c.list.blink->k.ikey) return n;
  else n = n->p.root;
  while (1) {
    if (isext(n)) return n;
    if (ikey == n->k.lext->k.ikey) {
      *fnd = 1;
      return n->k.lext;
    }
    n = (ikey < n->k.lext->k.ikey) ? n->c.child.left : n->c.child.right;
  }
}

Rb_node
rb_find_ikey(Rb_node n, int ikey) {

  int fnd;
  return rb_find_ikey_n(n, ikey, &fnd);
}


Rb_node
rb_find_gkey_n(Rb_node n, char *key,int (*fxn)(char *, char *), int *fnd) {

  int cmp;

  *fnd = 0;
  if (!ishead(n)) {
    fprintf(stderr, "rb_find_key_n called on non-head 0x%x\n", n);
    exit(1);
  }
  if (n->p.root == n) return n;
  cmp = (*fxn)(key, n->c.list.blink->k.key);
  if (cmp == 0) {
    *fnd = 1;
    return n->c.list.blink;
  }
  if (cmp > 0) return n;
  else n = n->p.root;
  while (1) {
    if (isext(n)) return n;
    cmp = (*fxn)(key, n->k.lext->k.key);
    if (cmp == 0) {
      *fnd = 1;
      return n->k.lext;
    }
    if (cmp < 0) n = n->c.child.left ; else n = n->c.child.right;
  }
}

Rb_node
rb_find_gkey(Rb_node n, char *key, int (*fxn)(char *, char *)) {

  int fnd;
  return rb_find_gkey_n(n, key, fxn, &fnd);
}

Rb_node
rb_insert_b(Rb_node n, char *key, char *val) {

  Rb_node newleft, newright, newnode, p; //list;

  if (ishead(n)) {
    if (n->p.root == n) {         /* Tree is empty */
      mk_new_ext(newnode, key, val);
      insert(newnode, n);
      n->p.root = newnode;
      newnode->p.parent = n;
      setroot(newnode);
      return newnode;
    } else {
      mk_new_ext(newright, key, val);
      insert(newright, n);
      newleft = newright->c.list.blink;
      setnormal(newleft);
      mk_new_int(newleft, newright, newleft->p.parent, isleft(newleft));
      p = rprev(newright);
      if (!ishead(p)) p->k.lext = newright;
      return newright;
    }
  } else {
    mk_new_ext(newleft, key, val);
    insert(newleft, n);
    setnormal(n);
    mk_new_int(newleft, n, n->p.parent, isleft(n));
    p = lprev(newleft);
    if (!ishead(p)) p->v.rext = newleft;
    return newleft;
  }
}

static
void recolor(Rb_node n) {

  Rb_node p, gp, s;
  int done = 0;

  while(!done) {
    if (isroot(n)) {
      setblack(n);
      return;
    }

    p = n->p.parent;

    if (isblack(p)) return;

    if (isroot(p)) {
      setblack(p);
      return;
    }

    gp = p->p.parent;
    s = sibling(p);
    if (isred(s)) {
      setblack(p);
      setred(gp);
      setblack(s);
      n = gp;
    } else {
      done = 1;
    }
  }
  /* p's sibling is black, p is red, gp is black */

  if ((isleft(n) == 0) == (isleft(p) == 0)) {
    single_rotate(gp, isleft(n));
    setblack(p);
    setred(gp);
  } else {
    single_rotate(p, isleft(n));
    single_rotate(gp, isleft(n));
    setblack(n);
    setred(gp);
  }
}

static
void single_rotate(Rb_node y, int l) {

  int rl, ir;
  Rb_node x, yp;
  //char *tmp;

  ir = isroot(y);
  yp = y->p.parent;
  if (!ir) {
    rl = isleft(y);
  }

  if (l) {
    x = y->c.child.left;
    y->c.child.left = x->c.child.right;
    setleft(y->c.child.left);
    y->c.child.left->p.parent = y;
    x->c.child.right = y;
    setright(y);
  } else {
    x = y->c.child.right;
    y->c.child.right = x->c.child.left;
    setright(y->c.child.right);
    y->c.child.right->p.parent = y;
    x->c.child.left = y;
    setleft(y);
  }

  x->p.parent = yp;
  y->p.parent = x;
  if (ir) {
    yp->p.root = x;
    setnormal(y);
    setroot(x);
  } else {
    if (rl) {
      yp->c.child.left = x;
      setleft(x);
    } else {
      yp->c.child.right = x;
      setright(x);
    }
  }
}

void
rb_delete_node(Rb_node n) {

  Rb_node s, p, gp;
  char ir;

  if (isint(n)) {
    fprintf(stderr, "Cannot delete an internal node: 0x%x\n", n);
    exit(1);
  }
  if (ishead(n)) {
    fprintf(stderr, "Cannot delete the head of an rb_tree: 0x%x\n", n);
    exit(1);
  }
  delete_item(n); /* Delete it from the list */
  p = n->p.parent;  /* The only node */
  if (isroot(n)) {
    p->p.root = p;
    free(n);
    return;
  }
  s = sibling(n);    /* The only node after deletion */
  if (isroot(p)) {
    s->p.parent = p->p.parent;
    s->p.parent->p.root = s;
    setroot(s);
    free(p);
    free(n);
    return;
  }
  gp = p->p.parent;  /* Set parent to sibling */
  s->p.parent = gp;
  if (isleft(p)) {
    gp->c.child.left = s;
    setleft(s);
  } else {
    gp->c.child.right = s;
    setright(s);
  }
  ir = isred(p);
  free(p);
  free(n);

  if (isext(s)) {      /* Update proper rext and lext values */
    p = lprev(s);
    if (!ishead(p)) p->v.rext = s;
    p = rprev(s);
    if (!ishead(p)) p->k.lext = s;
  } else if (isblack(s)) {
    fprintf(stderr, "DELETION PROB -- sib is black, internal\n");
    exit(1);
  } else {
    p = lprev(s);
    if (!ishead(p)) p->v.rext = s->c.child.left;
    p = rprev(s);
    if (!ishead(p)) p->k.lext = s->c.child.right;
    setblack(s);
    return;
  }

  if (ir) return;

  /* Recolor */

  n = s;
  p = n->p.parent;
  s = sibling(n);
  while(isblack(p) && isblack(s) && isint(s) &&
        isblack(s->c.child.left) && isblack(s->c.child.right)) {
    setred(s);
    n = p;
    if (isroot(n)) return;
    p = n->p.parent;
    s = sibling(n);
  }

  if (isblack(p) && isred(s)) {  /* Rotation 2.3b */
    single_rotate(p, isright(n));
    setred(p);
    setblack(s);
    s = sibling(n);
  }

  { Rb_node x, z; char il;

    if (isext(s)) {
      fprintf(stderr, "DELETION ERROR: sibling not internal\n");
      exit(1);
    }

    il = isleft(n);
    x = il ? s->c.child.left : s->c.child.right ;
    z = sibling(x);

    if (isred(z)) {  /* Rotation 2.3f */
      single_rotate(p, !il);
      setblack(z);
      if (isred(p)) setred(s); else setblack(s);
      setblack(p);
    } else if (isblack(x)) {   /* Recoloring only (2.3c) */
      if (isred(s) || isblack(p)) {
        fprintf(stderr, "DELETION ERROR: 2.3c not quite right\n");
        exit(1);
      }
      setblack(p);
      setred(s);
      return;
    } else if (isred(p)) { /* 2.3d */
      single_rotate(s, il);
      single_rotate(p, !il);
      setblack(x);
      setred(s);
      return;
    } else {  /* 2.3e */
      single_rotate(s, il);
      single_rotate(p, !il);
      setblack(x);
      return;
    }
  }
}


void
rb_print_tree_old(Rb_node t, int level) {

  int i;
  if (ishead(t) && t->p.parent == t) {
    printf("tree 0x%x is empty\n", t);
  } else if (ishead(t)) {
    printf("Head: 0x%x.  Root = 0x%x\n", t, t->p.root);
    rb_print_tree(t->p.root, 0);
  } else {
    if (isext(t)) {
      for (i = 0; i < level; i++) putchar(' ');
      printf("Ext node 0x%x: %c,%c: p=0x%x, k=%s\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->p.parent, t->k.key);
    } else {
      rb_print_tree(t->c.child.left, level+2);
      rb_print_tree(t->c.child.right, level+2);
      for (i = 0; i < level; i++) putchar(' ');
      printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%s,%s)\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->c.child.left,
              t->c.child.right,
              t->p.parent, t->k.lext->k.key, t->v.rext->k.key);
    }
  }
}



void
rb_print_tree(Rb_node t, int level) {

  int i;
  if (ishead(t) && t->p.parent == t) {
    printf("tree 0x%x is empty\n", t);
  } else if (ishead(t)) {
    printf("Head: 0x%x.  Root = 0x%x\n", t, t->p.root);
    rb_print_tree(t->p.root, 0);
  } else {
    if (isext(t)) {
      for (i = 0; i < level; i++) putchar(' ');
      printf("Ext node 0x%x: %c,%c: p=0x%x, k=%s\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->p.parent, t->k.key);
    } else {
      rb_print_tree(t->c.child.left, level+2);
      rb_print_tree(t->c.child.right, level+2);
      for (i = 0; i < level; i++) putchar(' ');
      printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%s,%s)\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->c.child.left,
              t->c.child.right,
              t->p.parent, t->k.lext->k.key, t->v.rext->k.key);
    }
  }
}

void
rb_print_ordered(Rb_node t, int level) {

  //int i;
  if (ishead(t) && t->p.parent == t) {
    printf("tree 0x%x is empty\n", t);
  } else if (ishead(t)) {
    printf("Head: 0x%x.  Root = 0x%x\n", t, t->p.root);
    rb_print_ordered(t->p.root, 0);
  } else {
    if (isext(t)) {
      //for (i = 0; i < level; i++) putchar(' ');
      //printf("Ext node 0x%x: %c,%c: p=0x%x, k=%s\n",
      //         t, isred(t)?'R':'B', isleft(t)?'l':'r', t->p.parent, t->k.key);
      printf("Ext node, %c, key: %s\n",isred(t)?'R':'B',t->k.key);
    } else {
      rb_print_ordered(t->c.child.left, level+2);
      rb_print_ordered(t->c.child.right, level+2);
      //for (i = 0; i < level; i++) putchar(' ');
#if 0
      printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%s,%s)\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->c.child.left,
              t->c.child.right,
              t->p.parent, t->k.lext->k.key, t->v.rext->k.key);
#endif

    }
  }
}


void
rb_iprint_tree(Rb_node t, int level) {

  int i;
  if (ishead(t) && t->p.parent == t) {
    printf("tree 0x%x is empty\n", t);
  } else if (ishead(t)) {
    printf("Head: 0x%x.  Root = 0x%x, < = 0x%x, > = 0x%x\n",
            t, t->p.root, t->c.list.blink, t->c.list.flink);
    rb_iprint_tree(t->p.root, 0);
  } else {
    if (isext(t)) {
      for (i = 0; i < level; i++) putchar(' ');
      printf("Ext node 0x%x: %c,%c: p=0x%x, <=0x%x, >=0x%x k=%d\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->p.parent,
              t->c.list.blink, t->c.list.flink, t->k.ikey);
    } else {
      rb_iprint_tree(t->c.child.left, level+2);
      rb_iprint_tree(t->c.child.right, level+2);
      for (i = 0; i < level; i++) putchar(' ');
      printf("Int node 0x%x: %c,%c: l=0x%x, r=0x%x, p=0x%x, lr=(%d,%d)\n",
              t, isred(t)?'R':'B', isleft(t)?'l':'r', t->c.child.left,
              t->c.child.right,
              t->p.parent, t->k.lext->k.ikey, t->v.rext->k.ikey);
    }
  }
}

int
rb_nblack(Rb_node n) {

  int nb;
  if (ishead(n) || isint(n)) {
    fprintf(stderr, "ERROR: rb_nblack called on a non-external node 0x%x\n",
            n);
    exit(1);
  }
  nb = 0;
  while(!ishead(n)) {
    if (isblack(n)) nb++;
    n = n->p.parent;
  }
  return nb;
}

int
rb_plength(Rb_node n) {

  int pl;
  if (ishead(n) || isint(n)) {
    fprintf(stderr, "ERROR: rb_plength called on a non-external node 0x%x\n",
            n);
    exit(1);
  }
  pl = 0;
  while(!ishead(n)) {
    pl++;
    n = n->p.parent;
  }
  return pl;
}

void
rb_free_tree(Rb_node n) {

  if (!ishead(n)) {
    fprintf(stderr, "ERROR: Rb_free_tree called on a non-head node\n");
    exit(1);
  }

  while(rb_first(n) != rb_nil(n)) {
    rb_delete_node(rb_first(n));
  }
  free(n);
}

char *
rb_val(Rb_node n) {

  return n->v.val;
}

Rb_node
rb_insert_a(Rb_node nd, char *key, char *val) {

  return rb_insert_b(nd->c.list.flink, key, val);
}

Rb_node
rb_insert(Rb_node tree, char *key, void *val) {

  return rb_insert_b(rb_find_key(tree, key), key, val);
}

Rb_node
rb_inserti(Rb_node tree, int ikey, void *val) {

  return rb_insert_b(rb_find_ikey(tree, ikey), (char *) ikey, val);
}

Rb_node
rb_insertg(Rb_node tree, char *key, void *val,
                          int (*func)(char *, char *)) {

  return rb_insert_b(rb_find_gkey(tree, key, func), key, val);
}


#ifdef __cplusplus
}
#endif

[Dda-cvs] ntdda/src/win32gui drawdialog.c,1.6,1.7

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv11918/win32gui

Modified Files:
	drawdialog.c 
Log Message:
Added rb tree.

Index: drawdialog.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** drawdialog.c	29 Jul 2006 03:14:28 -0000	1.6
--- drawdialog.c	31 Jul 2006 02:13:19 -0000	1.7
***************
*** 625,632 ****
--- 625,638 ----
    RECT drawSize;
    int orig_x, orig_y, ext_x, ext_y;
+ 
+   HANDLE h;
+   HBITMAP hbm;
  
    context = selection;
  
  
+ 
+ 
+ 
  
  /* Start test code for dialog param passing */
***************
*** 659,662 ****
--- 665,671 ----
    GetWindowRect (GetDlgItem (hDlg, IDC_DRAWSPACE), &drawSize);
    hdc = GetDC (GetDlgItem (hDlg, IDC_DRAWSPACE));       // i think this is DEADLY wrong  TRG  getDC does not "validate"
+ 
+ 
+ 
  
    SetClassLong (GetDlgItem (hDlg, IDC_DRAWSPACE), GCL_HCURSOR,
***************
*** 986,990 ****
  
  
! 
  static void
  drawSinglePoint (HDC hdc, DPoint * ptmp)
--- 995,1000 ----
  
  
! 
! // TODO: Combine this code with the code in graphics.c
  static void
  drawSinglePoint (HDC hdc, DPoint * ptmp)
***************
*** 1416,1419 ****
--- 1426,1430 ----
    ReleaseCapture ();
  }                               /* close handleMouseUp() */
+ 
  
  BOOL CALLBACK

[Dda-cvs] ntdda/src/win32gui drawdialog1.c, 1.4, NONE drawdialog2.c, 1.4, NONE drawdialog3.c, 1.19, NONE

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21487

Removed Files:
	drawdialog1.c drawdialog2.c drawdialog3.c 
Log Message:
Removed redundant drawdialog files.

--- drawdialog3.c DELETED ---

--- drawdialog1.c DELETED ---

--- drawdialog2.c DELETED ---

[Dda-cvs] ntdda/src/win32gui drawdialog.c,1.5,1.6

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv21120

Modified Files:
	drawdialog.c 
Log Message:
Copied drawdialog3 code to drawdialog.

Index: drawdialog.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** drawdialog.c	17 Dec 2003 23:36:36 -0000	1.5
--- drawdialog.c	29 Jul 2006 03:14:28 -0000	1.6
***************
*** 3,21 ****
   */
  
  #include "drawdialog.h"
  #include "winmain.h"
  #if OPENGL
  #include <gl/glut.h>
! #endif  
  
! #include <assert.h>
  
[...2692 lines suppressed...]
+ 
+     /* As usual, add a destroy handler if this gets long */
+   case WM_DESTROY:
+     /* Free up all allocated memory. */
+     freePointList ();
+     freeJointList ();
+     break;
+ 
+     /* Probably should free some memory, etc. before 
+      * shutting down.
+      */
+   default:
+     return FALSE;
+   }
+   return TRUE;
+ 
+   ReleaseDC (hDlg, hdc);
+   ReleaseDC (GetDlgItem (hDlg, IDC_DRAWSPACE), hdc);
+ 
+ }                               /* close DrawDlgProc() */

[Dda-cvs] ntdda/src/win32gui drawdialog3.c,1.18,1.19

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20445

Modified Files:
	drawdialog3.c 
Log Message:
Ran indent to clean up some formatting.

Index: drawdialog3.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog3.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** drawdialog3.c	25 Jul 2006 15:54:26 -0000	1.18
--- drawdialog3.c	29 Jul 2006 03:12:35 -0000	1.19
***************
*** 9,13 ****
  #if OPENGL
  #include <gl/glut.h>
! #endif  
  
  #include "bolt.h"
--- 9,13 ----
  #if OPENGL
  #include <gl/glut.h>
! #endif
  
[...3127 lines suppressed...]
  
!     /* As usual, add a destroy handler if this gets long */
!   case WM_DESTROY:
!     /* Free up all allocated memory. */
!     freePointList ();
!     freeJointList ();
!     break;
! 
!     /* Probably should free some memory, etc. before 
!      * shutting down.
!      */
!   default:
!     return FALSE;
!   }
!   return TRUE;
  
+   ReleaseDC (hDlg, hdc);
+   ReleaseDC (GetDlgItem (hDlg, IDC_DRAWSPACE), hdc);
  
+ }                               /* close DrawDlgProc() */

[Dda-cvs] htdocs dda.css,1.2,1.3 download.php,1.3,1.4

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv4155

Modified Files:
	dda.css download.php 
Log Message:
Fixed style, php driven pages ready to go on server.

Index: dda.css
===================================================================
RCS file: /cvsroot/dda/htdocs/dda.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dda.css	8 Jul 2006 19:36:28 -0000	1.2
--- dda.css	27 Jul 2006 14:42:17 -0000	1.3
***************
*** 38,48 ****
  span.author {
     font-family: Arial; 
!    color: green; 
!    font-size: 50%;
  }
  
  span.title { 
     font-family: Times New Roman;
!    color: purple;
     font-size: 120%;
     font-style: italic;
--- 38,48 ----
  span.author {
     font-family: Arial; 
!    color: black; 
!    font-size: 110%;
  }
  
  span.title { 
     font-family: Times New Roman;
!    color: black;
     font-size: 120%;
     font-style: italic;

Index: download.php
===================================================================
RCS file: /cvsroot/dda/htdocs/download.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** download.php	10 Jul 2006 22:27:18 -0000	1.3
--- download.php	27 Jul 2006 14:42:17 -0000	1.4
***************
*** 48,52 ****
            <ul>
              <li>
!               <p class="c14">
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M.</span> , <span class="title">Kinematics and
--- 48,52 ----
            <ul>
              <li>
!               <p>
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M.</span> , <span class="title">Kinematics and
***************
*** 62,66 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M., Doolin, D.M. and Abbot, T</span>. <span
--- 62,66 ----
              </li>
              <li>
!               <p>
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M., Doolin, D.M. and Abbot, T</span>. <span
***************
*** 77,81 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Doolin, D.M. and Sitar, N.</span>,
                  <span class="title">
--- 77,81 ----
              </li>
              <li>
!               <p>
                  <span class="author">Doolin, D.M. and Sitar, N.</span>,
                  <span class="title">
***************
*** 93,97 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Doolin, D.M. and Sitar, N.</span>,
                  <span class="title">
--- 93,97 ----
              </li>
              <li>
!               <p>
                  <span class="author">Doolin, D.M. and Sitar, N.</span>,
                  <span class="title">
***************
*** 107,111 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M.</span>, <span class="title">
--- 107,111 ----
              </li>
              <li>
!               <p>
                  <span class="author">Sitar, N., and MacLaughlin,
                  M.M.</span>, <span class="title">
***************
*** 122,126 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Tsesarsky, M. and Hatzor, Y.
                  H.</span>, <span class="title">Tunnel roof
--- 122,126 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky, M. and Hatzor, Y.
                  H.</span>, <span class="title">Tunnel roof
***************
*** 136,140 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Tsesarsky M., Hatzor, Y. H. and
                  Sitar N.</span>, 2005. <span class="title">
--- 136,140 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky M., Hatzor, Y. H. and
                  Sitar N.</span>, 2005. <span class="title">
***************
*** 150,154 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Hatzor, Y. H., Y. Zaslavsky, A.
                  A. Arzi, and A. Shapira</span>. 2004. 
--- 150,154 ----
              </li>
              <li>
!               <p>
                  <span class="author">Hatzor, Y. H., Y. Zaslavsky, A.
                  A. Arzi, and A. Shapira</span>. 2004. 
***************
*** 165,169 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
                  and Sitar, N.</span>, 2002. 
--- 165,169 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
                  and Sitar, N.</span>, 2002. 
***************
*** 182,186 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Hatzor, Y. H. and A. Feintuch</span>,
                  2001. <span class="title">The validity of dynamic displacement
--- 182,186 ----
              </li>
              <li>
!               <p>
                  <span class="author">Hatzor, Y. H. and A. Feintuch</span>,
                  2001. <span class="title">The validity of dynamic displacement
***************
*** 194,198 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Hatzor, Y. H. and R. Benary</span>,
                  1998. <span class="title">
--- 194,198 ----
              </li>
              <li>
!               <p>
                  <span class="author">Hatzor, Y. H. and R. Benary</span>,
                  1998. <span class="title">
***************
*** 208,212 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Kamai, R. and Hatzor,
                  Y.H.</span> <span class="title">Dynamic back
--- 208,212 ----
              </li>
              <li>
!               <p>
                  <span class="author">Kamai, R. and Hatzor,
                  Y.H.</span> <span class="title">Dynamic back
***************
*** 226,230 ****
              </li>
              <li>
!               <p class="c16">
                  <span lang="IT" class="author" xml:lang=
                  "IT">Hatzor, Y. H., Tsesarsky, M. And
--- 226,230 ----
              </li>
              <li>
!               <p>
                  <span lang="IT" class="author" xml:lang=
                  "IT">Hatzor, Y. H., Tsesarsky, M. And
***************
*** 242,246 ****
              </li>
              <li>
!               <p class="c20">
                  <span class="author">Tsesarsky, M. Hatzor, Y. H.,
                  Leviathan, Saltzman, U., Sokolowsky, M</span>. 2005.
--- 242,246 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky, M. Hatzor, Y. H.,
                  Leviathan, Saltzman, U., Sokolowsky, M</span>. 2005.
***************
*** 258,262 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Tsesarsky, M. and Hatzor, Y.
                  H.</span>, <span class="title">Deformation and
--- 258,262 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky, M. and Hatzor, Y.
                  H.</span>, <span class="title">Deformation and
***************
*** 276,280 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
                  and Sitar, N.</span>, <span class="title">Dynamic
--- 276,280 ----
              </li>
              <li>
!               <p>
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
                  and Sitar, N.</span>, <span class="title">Dynamic
***************
*** 293,297 ****
              </li>
              <li>
!               <p class="c16">
                  <span class="author">Hatzor, Y, H.</span>,
                  <span class="title">The Vousoir beam reaction
--- 293,297 ----
              </li>
              <li>
!               <p>
                  <span class="author">Hatzor, Y, H.</span>,
                  <span class="title">The Vousoir beam reaction

[Dda-cvs] ntdda ntdda.dsp,1.41,1.42

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv9329

Modified Files:
	ntdda.dsp 
Log Message:
DDA now compiles on new laptop.  Include paths
added to make the project build files more portable.

Index: ntdda.dsp
===================================================================
RCS file: /cvsroot/dda/ntdda/ntdda.dsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** ntdda.dsp	2 Jul 2006 23:37:45 -0000	1.41
--- ntdda.dsp	28 Jul 2006 15:44:06 -0000	1.42
***************
*** 44,48 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "C:\ddaincludes\libxml2-2.6.24.win32\include" /I "C:\ddaincludes\iconv-1.9.2.win32\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "DDAFORWINDOWS" /FAs /Fr /YX /FD /c
  # SUBTRACT CPP /WX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
--- 44,48 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /GX /O2 /I "include" /I "C:\ddaincludes\libxml2-2.6.24.win32\include" /I "C:\ddaincludes\iconv-1.9.2.win32\include" /I "C:\Program Files\HTML Help Workshop\include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "DDAFORWINDOWS" /FAs /Fr /YX /FD /c
  # SUBTRACT CPP /WX
  # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 71,75 ****
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "include/" /I "C:\ddaincludes\libxml2-2.6.24.win32\include" /I "C:\ddaincludes\iconv-1.9.2.win32\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DDAFORWINDOWS" /FR /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
--- 71,75 ----
  # PROP Target_Dir ""
  # ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
! # ADD CPP /nologo /MD /W3 /Gm /GX /ZI /Od /I "include/" /I "C:\ddaincludes\libxml2-2.6.24.win32\include" /I "C:\ddaincludes\iconv-1.9.2.win32\include" /I "C:\Program Files\HTML Help Workshop\include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "DDAFORWINDOWS" /FR /FD /c
  # SUBTRACT CPP /YX /Yc /Yu
  # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
***************
*** 82,86 ****
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib glut32.lib libxml2_a.lib wsock32.lib htmlhelp.lib zlib.lib iconv_a.lib /nologo /subsystem:windows /debug /machine:I386 /out:"bin/ntddad.exe" /pdbtype:sept /libpath:"C:\ddaincludes\libxml2-2.6.24.win32\lib" /libpath:"C:\ddaincludes\zlib-1.2.3.win32\lib" /libpath:"C:\ddaincludes\iconv-1.9.2.win32\lib"
  # SUBTRACT LINK32 /nodefaultlib
  
--- 82,86 ----
  LINK32=link.exe
  # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
! # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib comctl32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib libxml2_a.lib wsock32.lib htmlhelp.lib zlib.lib iconv_a.lib /nologo /subsystem:windows /debug /machine:I386 /out:"bin/ntddad.exe" /pdbtype:sept /libpath:"C:\ddaincludes\libxml2-2.6.24.win32\lib" /libpath:"C:\ddaincludes\zlib-1.2.3.win32\lib" /libpath:"C:\ddaincludes\iconv-1.9.2.win32\lib" /libpath:"C:\Program Files\HTML Help Workshop\lib"
  # SUBTRACT LINK32 /nodefaultlib
  

[Dda-cvs] ntdda/src dxf.c,1.4,1.5

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv764

Modified Files:
	dxf.c 
Log Message:
Added some comments to dxf about refactoring and structuring 
functions.

Index: dxf.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/dxf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dxf.c	25 Jul 2006 15:40:57 -0000	1.4
--- dxf.c	25 Jul 2006 23:06:17 -0000	1.5
***************
*** 16,22 ****
  
  
! 
  void
! process_line (int i)
  {
  
--- 16,32 ----
  
  
! 
! /** 
!  * The process of modularizing code is also 
!  * called "refactoring." Do a google search to 
!  * find out more about it.  In this case, 
!  * the code for parsing out the LINE element 
!  * is moved to its own function.  After other 
!  * elements are moved to their own functions, 
!  * code that is common to all the functions 
!  * can be furthered factored out.
!  */
  void
! process_line (const int i)
  {
  
***************
*** 30,34 ****
      dec = 0;
    }
! 
    jx1[count2] = atof (str[i + 12 + dec]);
    jy1[count2] = atof (str[i + 14 + dec]);
--- 40,51 ----
      dec = 0;
    }
! 
!   /** A better way to do this would be to do all the pointer
!    * arithmetic up front:
!    * int j = i + 12 + dec;
!    * atof(str[j]);
!    * atof(str[j+2]);
!    * etc.
!    */
    jx1[count2] = atof (str[i + 12 + dec]);
    jy1[count2] = atof (str[i + 14 + dec]);
***************
*** 109,113 ****
  
      if (strcmp (str[i], "LWPOLYLINE") == 0) {
! 
        if (strcmp (str[i + 9], "62") == 0) {
  
--- 126,138 ----
  
      if (strcmp (str[i], "LWPOLYLINE") == 0) {
! 
!        /** Using constants such as 9
!         * is generally a really bad idea
!         * because it makes the code much more
!         * difficult to read and understand.
!         * A better way to do this is to use 
!         * static const veriables, or preprocessor
!         * #defines.
!         */
        if (strcmp (str[i + 9], "62") == 0) {
  
***************
*** 279,284 ****
  
    // From this line the data that extracted from dxf file will be sorted 
!   // and will be wrote into geo file.
! 
    fp2 = fopen (geofilename, "w");
  
--- 304,313 ----
  
    // From this line the data that extracted from dxf file will be sorted 
!   // and will be wrote into geo file.
! 
!   /** This whole block of output code should go into it's 
!    * function.  This will make it much easier to extend
!    * or replace the code when necessary.
!    */
    fp2 = fopen (geofilename, "w");
  

[Dda-cvs] ntdda/include Dda.rc, 1.7, 1.8 resource.h, 1.3, 1.4 stress.h, 1.9, 1.10

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/include
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16652

Modified Files:
	Dda.rc resource.h stress.h 
Log Message:
Added Rooz extensions to geometry dialog for creating joint sets etc.

Index: Dda.rc
===================================================================
RCS file: /cvsroot/dda/ntdda/include/Dda.rc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Dda.rc	3 Mar 2006 21:17:26 -0000	1.7
--- Dda.rc	25 Jul 2006 15:54:41 -0000	1.8
***************
*** 208,217 ****
  //
  
! DRAWDLG DIALOGEX 10, 65500, 417, 372
  STYLE DS_LOCALEDIT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
      WS_SYSMENU
  EXSTYLE WS_EX_TOOLWINDOW
  CAPTION "New Geometry"
! FONT 8, "MS Sans Serif", 0, 0, 0x1
  BEGIN
      DEFPUSHBUTTON   "Save",IDOK,321,5,33,14
--- 208,217 ----
  //
  
! DRAWDLG DIALOGEX 10, 65500, 417, 404
  STYLE DS_LOCALEDIT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | 
      WS_SYSMENU
  EXSTYLE WS_EX_TOOLWINDOW
  CAPTION "New Geometry"
! FONT 8, "MS Sans Serif"
  BEGIN
      DEFPUSHBUTTON   "Save",IDOK,321,5,33,14
***************
*** 247,251 ****
      CTEXT           "0",DD_X,323,40,28,8,SS_CENTERIMAGE | SS_SUNKEN
      CTEXT           "0",DD_Y,358,40,28,8,SS_CENTERIMAGE | SS_SUNKEN
!     LTEXT           ",",-1,345,40,8,8
      GROUPBOX        "Current Coordinates",IDC_GROUPBOX3,317,26,95,30
      CONTROL         "On",DD_GRON,"Button",BS_AUTORADIOBUTTON | WS_GROUP,329,
--- 247,251 ----
      CTEXT           "0",DD_X,323,40,28,8,SS_CENTERIMAGE | SS_SUNKEN
      CTEXT           "0",DD_Y,358,40,28,8,SS_CENTERIMAGE | SS_SUNKEN
!     LTEXT           ",",IDC_STATIC,345,40,8,8
      GROUPBOX        "Current Coordinates",IDC_GROUPBOX3,317,26,95,30
      CONTROL         "On",DD_GRON,"Button",BS_AUTORADIOBUTTON | WS_GROUP,329,
***************
*** 269,279 ****
      EDITTEXT        IDC_GRID,270,321,23,14,ES_RIGHT | ES_NUMBER
      CONTROL         "Select",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,13,353,36,10
!     CONTROL         "Joints",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,65,353,
                      34,10
!     CONTROL         "Points",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,119,353,
                      35,10
!     CONTROL         "Bolts",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,167,353,
                      31,10
  END
  
--- 269,285 ----
      EDITTEXT        IDC_GRID,270,321,23,14,ES_RIGHT | ES_NUMBER
      CONTROL         "Select",IDC_RADIO1,"Button",BS_AUTORADIOBUTTON | 
!                     WS_GROUP,13,346,36,10
!     CONTROL         "Joints",IDC_RADIO2,"Button",BS_AUTORADIOBUTTON,65,346,
                      34,10
!     CONTROL         "Points",IDC_RADIO3,"Button",BS_AUTORADIOBUTTON,119,346,
                      35,10
!     CONTROL         "Bolts",IDC_RADIO4,"Button",BS_AUTORADIOBUTTON,167,346,
                      31,10
+     PUSHBUTTON      "&Joint",IDC_JOINT,225,361,36,12
+     PUSHBUTTON      "&Arc",IDC_ARC,272,361,36,12
+     GROUPBOX        "Manual Geometry Creator",IDC_STATIC,213,346,200,52
+     PUSHBUTTON      "&Block",IDC_BLOCK,320,360,36,12
+     PUSHBUTTON      "&Tunnel",IDC_TUNNEL,367,360,36,12
+     PUSHBUTTON      "J-&Set",IDC_JSET,225,378,36,12
  END
  
***************
*** 614,617 ****
--- 620,642 ----
  END
  
+ IDD_JOINT DIALOG DISCARDABLE  100, 100, 227, 102
+ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+ CAPTION "Joint"
+ FONT 8, "MS Sans Serif"
+ BEGIN
+     DEFPUSHBUTTON   "&Apply",IDOK,169,7,50,14
+     PUSHBUTTON      "Cancel",IDCANCEL,169,24,50,14
+     EDITTEXT        IDC_X1,52,55,45,15,ES_AUTOHSCROLL
+     EDITTEXT        IDC_X2,114,55,45,15,ES_AUTOHSCROLL
+     EDITTEXT        IDC_Y1,53,79,45,15,ES_AUTOHSCROLL
+     EDITTEXT        IDC_Y2,115,79,45,15,ES_AUTOHSCROLL
+     EDITTEXT        IDC_TYPE,66,17,45,15,ES_AUTOHSCROLL
+     LTEXT           "Joint Type",IDC_STATIC,19,19,37,11
+     LTEXT           "X-Coord",IDC_STATIC,7,59,29,11
+     LTEXT           "Y-Coord",IDC_STATIC,7,82,29,11
+     LTEXT           "Start Point",IDC_STATIC,58,40,34,11
+     LTEXT           "End Point",IDC_STATIC,119,40,34,11
+ END
+ 
  
  #ifdef APSTUDIO_INVOKED
***************
*** 651,654 ****
--- 676,684 ----
  GUIDELINES DESIGNINFO DISCARDABLE 
  BEGIN
+     "DRAWDLG", DIALOG
+     BEGIN
+         BOTTOMMARGIN, 398
+     END
+ 
      "UNITDLG", DIALOG
      BEGIN
***************
*** 738,741 ****
--- 768,779 ----
          BOTTOMMARGIN, 159
      END
+ 
+     IDD_JOINT, DIALOG
+     BEGIN
+         LEFTMARGIN, 7
+         RIGHTMARGIN, 220
+         TOPMARGIN, 7
+         BOTTOMMARGIN, 95
+     END
  END
  #endif    // APSTUDIO_INVOKED

Index: resource.h
===================================================================
RCS file: /cvsroot/dda/ntdda/include/resource.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** resource.h	4 Mar 2006 18:32:12 -0000	1.3
--- resource.h	25 Jul 2006 15:54:41 -0000	1.4
***************
*** 97,100 ****
--- 97,101 ----
  #define ICON_GRAVITY                    168
  #define IDD_CONTACT                     170
+ #define IDD_JOINT                       171
  #define IDD_DIALOG1                     200
  #define IDD_BLOCKPROPS                  200
***************
*** 116,121 ****
--- 117,126 ----
  #define APWEDGE_A1                      1013
  #define IDC_DRAWSPACE                   1014
+ #define IDC_X2                          1014
  #define IDC_TMINX                       1015
+ #define IDC_Y1                          1015
+ #define IDC_Y2                          1016
  #define IDC_MINY                        1017
+ #define IDC_TYPE                        1017
  #define IDC_MAXX                        1018
  #define IDC_MAXY                        1019
***************
*** 158,161 ****
--- 163,172 ----
  #define AD_DYNAMIC                      1070
  #define AD_STATIC                       1071
+ #define IDC_JOINT                       1073
+ #define IDC_ARC                         1074
+ #define IDC_X1                          1074
+ #define IDC_BLOCK                       1075
+ #define IDC_TUNNEL                      1076
+ #define IDC_JSET                        1077
  #define IDC_LISTBOX3                    1102
  #define GD_SAVE                         1102
***************
*** 271,281 ****
  #define POPUP_GEOMETRY                  2000
  #define POPUP_ANALYSIS                  2001
! #define POPUP_REPLAY                    2002
! 
! // DXF Handling 
! #define IMPORT_DXF                      3000
! #define EXPORT_DXF                      3001
! 
! 
  #define ID_OPTION_DRAW                  32771
  #define ID_OPTION_SELECT                32772
--- 282,288 ----
  #define POPUP_GEOMETRY                  2000
  #define POPUP_ANALYSIS                  2001
! #define POPUP_REPLAY                    2002
! #define IMPORT_DXF                      3000
! #define EXPORT_DXF                      3001
  #define ID_OPTION_DRAW                  32771
  #define ID_OPTION_SELECT                32772
***************
*** 351,355 ****
  #define IDC_STATIC                      -1
  
- 
  // Next default values for new objects
  // 
--- 358,361 ----
***************
*** 357,363 ****
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_NO_MFC                     1
! #define _APS_NEXT_RESOURCE_VALUE        171
  #define _APS_NEXT_COMMAND_VALUE         40062
! #define _APS_NEXT_CONTROL_VALUE         1072
  #define _APS_NEXT_SYMED_VALUE           101
  #endif
--- 363,369 ----
  #ifndef APSTUDIO_READONLY_SYMBOLS
  #define _APS_NO_MFC                     1
! #define _APS_NEXT_RESOURCE_VALUE        172
  #define _APS_NEXT_COMMAND_VALUE         40062
! #define _APS_NEXT_CONTROL_VALUE         1075
  #define _APS_NEXT_SYMED_VALUE           101
  #endif

Index: stress.h
===================================================================
RCS file: /cvsroot/dda/ntdda/include/stress.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** stress.h	30 Nov 2002 14:33:39 -0000	1.9
--- stress.h	25 Jul 2006 15:54:41 -0000	1.10
***************
*** 93,96 ****
--- 93,99 ----
                                  double strains[4]);
  
+ void     stress_planestrain_mohrcoulomb    (double * e0,
+                                             double strains[4]);
+ 											
  
  void     stress_planestress    (double * e0,

[Dda-cvs] ntdda/src/win32gui drawdialog3.c,1.17,1.18

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src/win32gui
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv16632

Modified Files:
	drawdialog3.c 
Log Message:
Added Rooz extensions to geometry dialog for creating joint sets etc.

Index: drawdialog3.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/win32gui/drawdialog3.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** drawdialog3.c	7 Jun 2006 15:32:44 -0000	1.17
--- drawdialog3.c	25 Jul 2006 15:54:26 -0000	1.18
***************
*** 18,22 ****
  #endif
  
! 
  
  /* These will probably mutate into general purpose functions.
--- 18,23 ----
  #endif
  
! BOOL CALLBACK JointDlgProc(HWND, UINT, WPARAM, LPARAM);
! static HINSTANCE  hInstance;
  
  /* These will probably mutate into general purpose functions.
***************
*** 37,40 ****
--- 38,42 ----
  #define WMU_GETSELECTSTATE WM_USER+2
  
+ #define ID_EDIT     1
  
  /* Bounding box.  Was set in winmain.  Needs to be set 
***************
*** 84,88 ****
  
  static int changeGridSpacing(HWND,LPARAM,WPARAM);
! static int handleWMCommand(HWND, LPARAM, WPARAM);
  static void handleLButtonDown(HWND hDlg, LPARAM lParam);
  static void handleLButtonUp(HWND hDlg, LPARAM lParam);
--- 86,90 ----
  
  static int changeGridSpacing(HWND,LPARAM,WPARAM);
! static int handleWMCommand(HWND, UINT, LPARAM, WPARAM);
  static void handleLButtonDown(HWND hDlg, LPARAM lParam);
  static void handleLButtonUp(HWND hDlg, LPARAM lParam);
***************
*** 644,649 ****
  
  
- 
- 
  /* Also sets radius variable used to draw points.
   */
--- 646,649 ----
***************
*** 1471,1479 ****
  }  /* close handleMouseUp() */
  
  
  
  static int
! handleWMCommand(HWND hDlg, LPARAM lParam, WPARAM wParam)
  {
     switch (LOWORD(wParam))
  	{
--- 1471,1521 ----
  }  /* close handleMouseUp() */
  
+ BOOL CALLBACK
+ JointDlgProc(HWND hDlg, UINT message,
+              WPARAM wParam, LPARAM lParam)
+ {
+      switch (message)
+      {
+      case WM_INITDIALOG :
+ 
+ 		  SetDlgItemInt (hDlg,IDC_X1,0,FALSE);
+ 		  SetDlgItemInt (hDlg,IDC_Y1,0,FALSE);
+ 		  SetDlgItemInt (hDlg,IDC_X2,10,FALSE);
+ 		  SetDlgItemInt (hDlg,IDC_Y2,10,FALSE);
+ 		  SetDlgItemInt (hDlg,IDC_TYPE,1,FALSE);
  
+           return TRUE ;
+           
+      case WM_COMMAND :
+           switch (LOWORD (wParam))
+           {
+           case IDOK :
+ 
+ 			  ptBegin.x = GetDlgItemInt (hDlg, IDC_X1,  NULL, TRUE) ;
+ 			  ptBegin.y = GetDlgItemInt (hDlg, IDC_Y1,  NULL, TRUE) ;
+ 			  ptNew.x = GetDlgItemInt (hDlg, IDC_X2,  NULL, TRUE) ;
+ 			  ptNew.y = GetDlgItemInt (hDlg, IDC_Y2,  NULL, TRUE) ;
+ 			  type = GetDlgItemInt (hDlg, IDC_TYPE,  NULL, TRUE) ;
+               ptBegin.x = (long)floor(ptBegin.x/(ScaleX/maxSize));
+               ptBegin.y = (long)floor(ptBegin.y/(ScaleY/maxSize));
+ 			  ptNew.x = (long)floor(ptNew.x/(ScaleX/maxSize));
+ 			  ptNew.y = (long)floor(ptNew.y/(ScaleY/maxSize));
+ 
+ 			  addJoint(hDlg);
+ 
+ 				 return FALSE ;
+           case IDCANCEL :
+                EndDialog (hDlg, 0) ;
+                return TRUE ;
+           }
+           break ;
+      }
+      return FALSE ;
+ }
  
  static int
! handleWMCommand(HWND hDlg, UINT iMessage, LPARAM lParam, WPARAM wParam)
  {
+ 
     switch (LOWORD(wParam))
  	{
***************
*** 1490,1494 ****
  	   case DD_LP: type = 2; tool=loadpoint; hCurrentPen = drawPen[1]; break;
    		case DD_HP: type = 3; tool=holepoint; hCurrentPen = drawPen[1]; break;
! 				
  	   case DD_BOLT1:
          /*type = 4; tool = bolt;*/
--- 1532,1544 ----
  	   case DD_LP: type = 2; tool=loadpoint; hCurrentPen = drawPen[1]; break;
    		case DD_HP: type = 3; tool=holepoint; hCurrentPen = drawPen[1]; break;
! 	   
! 		case IDC_JOINT:
! 		   DialogBox(hInstance, MAKEINTRESOURCE(IDD_JOINT), NULL, JointDlgProc);
! 		 break;
! 
! 		 case IDC_ARC:
!            
! 		 break;
! 
  	   case DD_BOLT1:
          /*type = 4; tool = bolt;*/
***************
*** 1545,1548 ****
--- 1595,1600 ----
        case IDOK:
          	return(handleSave(hDlg));
+ 	  
+ 	  
  
       /* TODO: Add a default case with appropriate action.
***************
*** 1563,1566 ****
--- 1615,1623 ----
    	switch (iMessage)
    	{
+ 	  case WM_CREATE:
+           //hInstance = ((LPCREATESTRUCT) lParam)->hInstance ;
+ 		  hInstance = (HINSTANCE) GetWindowWord(hDlg, GWL_HINSTANCE);
+       break ;
+ 
        case WM_INITDIALOG:
  	      handleInit(hDlg, wParam, lParam);
***************
*** 1577,1581 ****
        
  	  case WM_COMMAND:
!         return(handleWMCommand(hDlg, lParam, wParam));
        break;
  
--- 1634,1638 ----
        
  	  case WM_COMMAND:
!         return(handleWMCommand(hDlg, iMessage, lParam, wParam));
        break;
  

[Dda-cvs] ntdda/src dxf.c,1.3,1.4 stress.c,1.11,1.12

[David M. D. <do...@us...>]

Update of /cvsroot/dda/ntdda/src
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv13438

Modified Files:
	dxf.c stress.c 
Log Message:
Started refactoring dxf code.

Index: stress.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/stress.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** stress.c	20 Dec 2002 05:20:02 -0000	1.11
--- stress.c	25 Jul 2006 15:40:57 -0000	1.12
***************
*** 7,11 ****
  
  #include "stress.h"
! 
  
  
--- 7,11 ----
  
  #include "stress.h"
! #include "mohrcoulomb.h"
  
  
***************
*** 60,63 ****
--- 60,67 ----
  static const int _size_  = 13;
  
+ // The following arrays should be obtained from analysis dialog
+ static const int _c_     = 14;
+ static const int _phi_   = 15;
+ static const int _psi_   = 16;
  
  int
***************
*** 170,175 ****
--- 174,212 ----
     */
     stress[7] += -(nu/(1-nu))*(strain[1] + strain[2]);
+ 
  }
  
+ void
+ stress_planestrain_mohrcoulomb(double * stress, double strain[4]) {
+ 
+    double a1;
+    double E  = stress[_E_];
+    double nu = stress[_nu_];
+    // probably below array should be added 
+    // that can be obtained from analysisreader
+    double c = stress[_c_];
+    double phi = stress[_phi_];
+    double psi = stress[_psi_];
+ 
+    double sigma[5];
+ 
+    a1       = E/(1 + nu);
+    sigma[1] = a1*( ((strain[1]*(1-nu))/(1-2*nu)) + ((strain[2]*nu)/(1-2*nu)) );
+    sigma[2] = a1*((strain[1]*nu)/(1-2*nu) + (strain[2]*(1-nu)/(1-2*nu)));
+    sigma[3] = a1*strain[3]/2.0;
+    sigma[4] = -(nu/(1-nu))*(strain[1] + strain[2]);
+ 
+   /* in the following subroutine:
+    * "c" is cohesion
+    * "phi" is friction angle
+    * "psi" is dilition angle
+    * "nu" is poission ratio
+    * "E" is young modolus
+    * "strain" is the strain of current step
+    * "stress" is the stress of block after correction using Mohr-Coulomb criteria
+    * "sigma" is the stress of block in the currect step
+    */
+    mohrcoulomb(c,phi,psi,nu,E,strain,sigma,stress);
+ }
  
  void

Index: dxf.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/dxf.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dxf.c	6 Jul 2006 02:28:27 -0000	1.3
--- dxf.c	25 Jul 2006 15:40:57 -0000	1.4
***************
*** 9,18 ****
  
  
  void
  dxf_read_file (FILE * fp1, char *geofilename)
  {
  
-   double *jx1, *jy1, *jx2, *jy2;
-   char str[5000][50];
  
    // Change to using ofp
--- 9,46 ----
  
  
+ static int count2;
+ static char str[5000][50];
+ static long *type;
+ static int dec;
+ static double *jx1, *jy1, *jx2, *jy2;
+ 
+ 
+ 
+ void
+ process_line (int i)
+ {
+ 
+   count2 += 1;
+   if (strcmp (str[i + 9], "62") == 0) {
+ 
+     type[count2] = atoi (str[i + 10]) + 1;
+     dec = 2;
+   } else {
+     type[count2] = 1;
+     dec = 0;
+   }
+ 
+   jx1[count2] = atof (str[i + 12 + dec]);
+   jy1[count2] = atof (str[i + 14 + dec]);
+   jx2[count2] = atof (str[i + 18 + dec]);
+   jy2[count2] = atof (str[i + 20 + dec]);
+ 
+ }
+ 
+ 
  void
  dxf_read_file (FILE * fp1, char *geofilename)
  {
  
  
    // Change to using ofp
***************
*** 22,28 ****
    //FILE * ofp;
  
!   int count1 = 0, count2 = 0, i, j;
!   long *type, pn;
!   int cabcou = 0, dec, ii, pltype, ctype, n1;
    int fixn = 0, measn = 0, holen = 0, loadn = 0;
    double r0, se, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg;
--- 50,61 ----
    //FILE * ofp;
  
!   int count1 = 0;
!   //int count2 = 0;
!   int i, j;
!   //long *type;
!   long pn;
!   int cabcou = 0;
!   //int dec;
!   int ii, pltype, ctype, n1;
    int fixn = 0, measn = 0, holen = 0, loadn = 0;
    double r0, se, u, v, x1, x2, x3, y1, y2, y3, x0, y0, deg;
***************
*** 34,37 ****
--- 67,72 ----
  
  
+   count2 = 0;
+ 
    while (!feof (fp1)) {
  
***************
*** 67,86 ****
      if (strcmp (str[i], "LINE") == 0) {
  
!       count2 += 1;
!       if (strcmp (str[i + 9], "62") == 0) {
  
!         type[count2] = atoi (str[i + 10]) + 1;
!         dec = 2;
!       } else {
!         type[count2] = 1;
!         dec = 0;
!       }
  
-       jx1[count2] = atof (str[i + 12 + dec]);
-       jy1[count2] = atof (str[i + 14 + dec]);
-       jx2[count2] = atof (str[i + 18 + dec]);
-       jy2[count2] = atof (str[i + 20 + dec]);
  
-     }
  
      if (strcmp (str[i], "LWPOLYLINE") == 0) {
--- 102,110 ----
      if (strcmp (str[i], "LINE") == 0) {
  
!       process_line (i);
  
!     }
  
  
  
      if (strcmp (str[i], "LWPOLYLINE") == 0) {
***************
*** 220,225 ****
        jy2[count2] = y2;
        type[count2] = ctype;
!     }
! 
  
      if (strcmp (str[i], "MTEXT") == 0) {
--- 244,249 ----
        jy2[count2] = y2;
        type[count2] = ctype;
!     }
! 
  
      if (strcmp (str[i], "MTEXT") == 0) {

[Dda-cvs] htdocs todo.txt,NONE,1.1

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv20312

Added Files:
	todo.txt 
Log Message:
Added todo list.

--- NEW FILE: todo.txt ---
* Clean up table styles to ensure uniform height/width of table.

* Work on automatic reference list generation to get topics
and email information correct.

[Dda-cvs] htdocs photos.php,1.1,1.2 references.php,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv19275

Modified Files:
	photos.php references.php 
Log Message:
Cleaned up reference and photo pages.

Index: references.php
===================================================================
RCS file: /cvsroot/dda/htdocs/references.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** references.php	8 Jul 2006 16:10:29 -0000	1.1
--- references.php	11 Jul 2006 15:33:46 -0000	1.2
***************
*** 1,634 ****
! <html>
! 
! <head>
! <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
! <meta name="ProgId" content="FrontPage.Editor.Document">
! <meta http-equiv="Content-Type" content="text/html; charset=windows-1256">
! <title>References</title>
! </head>
! 
! <body>
[...1311 lines suppressed...]
+           
+          <?php
+            include("refs/icadd5.html");
+          ?>                      
+           
+                   
+         </td>
+         
+       </tr>
+     </table>
+     <address>
+        
+     </address>
+     <!-- Created: Tue Aug 31 08:53:22 Pacific Daylight Time 2004 -->
+     <!-- hhmts start -->
+     <p>
+       Last modified: Aprill 18 P 2006
+     </p>
+   </body>
  </html>

Index: photos.php
===================================================================
RCS file: /cvsroot/dda/htdocs/photos.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** photos.php	8 Jul 2006 16:10:29 -0000	1.1
--- photos.php	11 Jul 2006 15:33:46 -0000	1.2
***************
*** 1,69 ****
! <html>
! 
! <head>
! <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
! <meta name="ProgId" content="FrontPage.Editor.Document">
! <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
! <title>Photos</title>
! </head>
! 
! <body>
! 
! <font FACE="Arial" SIZE="4"><i><b>
! <table border="4" width="100%" id="table1" cellpadding="10">
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     &nbsp;</td>
!     <td width="78%" bgcolor="#CACAFF"><font FACE="Times New Roman">
!     <p align="center"><font size="7">Photos</font></td>
!   </tr>
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     <b>
!     <font FACE="Arial" SIZE="4">
!     <ul>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="../index.htm"><font color="#000000" size="4">Home page</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="Research_Page.htm"><font color="#000000" size="4">Research</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!           <font color="#0000FF" FACE="Times New Roman">
!       	<a href="Download_Page.htm"><font color="#000000" size="4">Download</font></a><font color="#000000" size="4">s</font></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font face="Times New Roman">
!       <a href="Members_Page.htm"><font color="#000000" size="4">Members</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font FACE="Times New Roman">
!       <a href="References_Page.htm"><font color="#000000" size="4">References</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Links_Page.htm"><font color="#000000" size="4">Links</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Photos_Page.htm"><font color="#000000" size="4">Photos</font></a></font></li>
!     </ul>
! </font></b>
! 	<p>&nbsp;</td>
!     <td width="78%"><font FACE="Times New Roman" SIZE="3">
! 
! 
! <font FACE="Arial" SIZE="4"><i><b>
!     <p align="center"><font size="6">Under Construction</font></p>
!     </b></i></font>
! 
!     <p ALIGN="justify">&nbsp;</p></font>
! 	<p>&nbsp;</td>
!   </tr>
! </table>
! </b></i></font>
! 
! </body>
! 
! </html>
\ No newline at end of file
--- 1,57 ----
! <!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>
!       Photos
!     </title>
! <style type="text/css">
! /*<![CDATA[*/
!  p.c9 {text-align: justify}
!  p.c8 {font-size: 200%; font-style: italic; font-weight: bold; text-align: center}
!  p.c7 {color: #0000FF; font-family: Times New Roman; line-height: 150%; text-align: justify}
!  span.c6 {color: #000000; font-size: 120%}
!  a.c5 {color: #000000; font-size: 120%}
!  a.c4 {color: #000000; font-family: Times New Roman; font-size: 120%}
!  p.c3 {line-height: 150%; text-align: justify}
!  a.c2 {color: #000000; font-family: Arial; font-size: 120%}
!  p.c1 {font-family: Times New Roman; font-size: larger; text-align: center}
! /*]]>*/
! </style>
!   </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">Photos</span>
!           </p>
!         </td>
!       </tr>
!       <tr>
!         <td width="17%" valign="top" bgcolor="#CACAFF">
!           <?php
!                   include("menu.php");
!                 ?>
!         </td>
!         <td width="78%">
!           <p class="c8">
!             Under Construction
!           </p>
!           <p class="c9">
!              
!           </p>
!           <p>
!              
!           </p>
!         </td>
!       </tr>
!     </table>
!   </body>
! </html>

[Dda-cvs] htdocs members.php,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv29018

Modified Files:
	members.php 
Log Message:
Fixed style info for members page.

Index: members.php
===================================================================
RCS file: /cvsroot/dda/htdocs/members.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** members.php	8 Jul 2006 16:10:29 -0000	1.1
--- members.php	10 Jul 2006 22:37:01 -0000	1.2
***************
*** 1,70 ****
! <html>
! 
! <head>
! <meta http-equiv="Content-Language" content="en-us">
! <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
! <meta name="ProgId" content="FrontPage.Editor.Document">
! <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
! <title>Members</title>
! </head>
! 
! <body>
  
! <font FACE="Arial" SIZE="4"><i><b>
! <table border="4" width="100%" id="table1" cellpadding="10">
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     &nbsp;</td>
!     <td width="78%" bgcolor="#CACAFF"><font FACE="Times New Roman">
!     <p align="center"><font size="7">Members</font></td>
!   </tr>
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     <b>
!     <font FACE="Arial" SIZE="4">
!     <ul>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="../index.htm"><font color="#000000" size="4">Home page</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="Research_Page.htm"><font color="#000000" size="4">Research</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!           <font color="#0000FF" FACE="Times New Roman">
!       	<a href="Download_Page.htm"><font color="#000000" size="4">Download</font></a><font color="#000000" size="4">s</font></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font face="Times New Roman">
!       <a href="Members_Page.htm"><font color="#000000" size="4">Members</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font FACE="Times New Roman">
!       <a href="References_Page.htm"><font color="#000000" size="4">References</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Links_Page.htm"><font color="#000000" size="4">Links</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Photos_Page.htm"><font color="#000000" size="4">Photos</font></a></font></li>
!     </ul>
! </font></b>
! 	<p>&nbsp;</td>
!     <td width="78%"><font FACE="Times New Roman" SIZE="3">
! 
! 
! <font FACE="Arial" SIZE="4"><i><b>
!     <p align="center"><font size="6">Under Construction</font></p>
!     </b></i></font>
  
!     <p ALIGN="justify">&nbsp;</p></font>
! 	<p>&nbsp;</td>
!   </tr>
! </table>
! </b></i></font>
  
- </body>
  
! </html>
\ No newline at end of file
--- 1,54 ----
! <!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%">
!           <p class="c8">
!             Under Construction
!           </p>
!           <p class="c9">
!              
!           </p>
!           <p>
!              
!           </p>
!         </td>
!       </tr>
!     </table>
!   </body>
! </html>

[Dda-cvs] htdocs research.php,1.2,1.3

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv27289

Modified Files:
	research.php 
Log Message:
Fixed style info for research page.

Index: research.php
===================================================================
RCS file: /cvsroot/dda/htdocs/research.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** research.php	8 Jul 2006 19:35:59 -0000	1.2
--- research.php	10 Jul 2006 22:31:40 -0000	1.3
***************
*** 36,50 ****
          <td width="78%">
            <div id="maincol">
!             <p class="c9">
                This web site has been developed for sharing work
                of all members for Discontinuous Deformation
                Analysis software (DDA). Currently available
!               <span class="c8">researches area contains
!               of:</span>
              </p>
            </div>
            <ol>
              <li>
!               <p class="c9">
                  Increasing the graphical ability to create the
                  geometry of model easily.
--- 36,50 ----
          <td width="78%">
            <div id="maincol">
!             <p>
                This web site has been developed for sharing work
                of all members for Discontinuous Deformation
                Analysis software (DDA). Currently available
!               researches area contains
!               of:
              </p>
            </div>
            <ol>
              <li>
!               <p>
                  Increasing the graphical ability to create the
                  geometry of model easily.
***************
*** 52,63 ****
              </li>
              <li>
!               <p class="c9">
!                 <span class="c8">Adding the material models that
                  simulate viscoelastic and viscoplastic (creep)
!                 and elastoplastic behavior.</span>
                </p>
              </li>
              <li>
!               <p class="c9">
                  Implementing the reinforcement elements such as
                  fully grouted cable bolt, lining.
--- 52,63 ----
              </li>
              <li>
!               <p>
!                 Adding the material models that
                  simulate viscoelastic and viscoplastic (creep)
!                 and elastoplastic behavior.
                </p>
              </li>
              <li>
!               <p>
                  Implementing the reinforcement elements such as
                  fully grouted cable bolt, lining.
***************
*** 65,69 ****
              </li>
              <li>
!               <p class="c9">
                  Graphical output in a wide range of
                  industry-standard formats such as such as Excel,
--- 65,69 ----
              </li>
              <li>
!               <p>
                  Graphical output in a wide range of
                  industry-standard formats such as such as Excel,
***************
*** 72,80 ****
              </li>
              <li>
!               <p class="c9">
                  Creating HTML-based Help accessed from the Help
                  menu describes use of the user-interface; and
!                 provides access to the full <span class=
!                 "nmc">DDA</span> Manual.
                </p>
              </li>
--- 72,79 ----
              </li>
              <li>
!               <p>
                  Creating HTML-based Help accessed from the Help
                  menu describes use of the user-interface; and
!                 provides access to the full DDA Manual.
                </p>
              </li>
***************
*** 86,92 ****
        </tr>
      </table>
!     <p class="c10">
!        
!     </p>
    </body>
  </html>
--- 85,89 ----
        </tr>
      </table>
! 
    </body>
  </html>

[Dda-cvs] htdocs download.php,1.2,1.3

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv25926

Modified Files:
	download.php 
Log Message:
Finished fixing style information to download page.

Index: download.php
===================================================================
RCS file: /cvsroot/dda/htdocs/download.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** download.php	8 Jul 2006 19:36:15 -0000	1.2
--- download.php	10 Jul 2006 22:27:18 -0000	1.3
***************
*** 64,104 ****
                <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
!                 M.M., Doolin, D.M. and Abbot, T. Investigation of
                  slope stability kinematics using discontinuous
!                 deformation analysis. International Journal of
                  Rock Mechanics and Mining Sciences, v. 38, pp.
!                 753-762, 2001.</span><i><b><a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a></b></i>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.,
                  Accuracy of the DDA method with respect to a
!                 single sliding block. In: Rock Mechanics in the
                  National Interest, proceedings of the 38th U.S.
                  Rock Mechanics Symposium, Washington D.C., July
                  5-7, 2001. Balkema, Rotterdam, pp.
!                 1429-1435.</span><i><b><a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a></b></i>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.,
                  DDAML --- discontinuous deformation dnalysis
!                 markup language.Int. J. of Rock Mechanics and
                  Mining Sciences, V38, N3, April, 2001,
!                 467-474.</span><i><b><a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a></b></i>
                </p>
              </li>
--- 64,107 ----
                <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
!                 M.M., Doolin, D.M. and Abbot, T</span>. <span
!                 class="title">Investigation of
                  slope stability kinematics using discontinuous
!                 deformation analysis</span>. International Journal of
                  Rock Mechanics and Mining Sciences, v. 38, pp.
!                 753-762, 2001.<a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.</span>,
!                 <span class="title">
                  Accuracy of the DDA method with respect to a
!                 single sliding block</span>. In: Rock Mechanics in the
                  National Interest, proceedings of the 38th U.S.
                  Rock Mechanics Symposium, Washington D.C., July
                  5-7, 2001. Balkema, Rotterdam, pp.
!                 1429-1435.<a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.</span>,
!                 <span class="title">
                  DDAML --- discontinuous deformation dnalysis
!                 markup language</span>.Int. J. of Rock Mechanics and
                  Mining Sciences, V38, N3, April, 2001,
!                 467-474.<a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" src="Images/list.gif" alt=
                  "download icon" width="20" height=
!                 "21" /></a>
                </p>
              </li>
***************
*** 106,118 ****
                <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
!                 M.M., Investigation of slope stability kinematics
!                 using discontinuous deformation analysis. Invited
                  Keynote Lecture, II Panamerican Symposium on
                  Landslides, Rio de Janeiro, Nov. 10-14th,
!                 1997.</span><i><b><a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" alt="download icon" src=
                  "Images/list.gif" width="20" height=
!                 "21" /></a></b></i>
                </p>
              </li>
--- 109,122 ----
                <p class="c16">
                  <span class="author">Sitar, N., and MacLaughlin,
!                 M.M.</span>, <span class="title">
!                 Investigation of slope stability kinematics
!                 using discontinuous deformation analysis</span>. Invited
                  Keynote Lecture, II Panamerican Symposium on
                  Landslides, Rio de Janeiro, Nov. 10-14th,
!                 1997.<a class="c13" href=
                  "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
                  <img border="0" alt="download icon" src=
                  "Images/list.gif" width="20" height=
!                 "21" /></a>
                </p>
              </li>
***************
*** 134,145 ****
                <p class="c16">
                  <span class="author">Tsesarsky M., Hatzor, Y. H. and
!                 Sitar N.2005.Dynamic Displacement of a Block on
                  an Inclined Plane: Analytical, Experimental and
!                 DDA Results. Technical Note. Rock Mechanics and
                  Rock Engineering. Vol. 38, No. 2, pp.
!                 153-167.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img alt=
                  "download icon" border="0" src="Images/list.gif"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
--- 138,150 ----
                <p class="c16">
                  <span class="author">Tsesarsky M., Hatzor, Y. H. and
!                 Sitar N.</span>, 2005. <span class="title">
!                 Dynamic Displacement of a Block on
                  an Inclined Plane: Analytical, Experimental and
!                 DDA Results</span>. Technical Note. Rock Mechanics and
                  Rock Engineering. Vol. 38, No. 2, pp.
!                 153-167.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img alt=
                  "download icon" border="0" src="Images/list.gif"
!                 width="20" height="21" /></a>
                </p>
              </li>
***************
*** 147,159 ****
                <p class="c16">
                  <span class="author">Hatzor, Y. H., Y. Zaslavsky, A.
!                 A. Arzi, and A. Shapira. 2004. Dynamic stability
                  analysis of jointed rock slopes using the DDA
!                 method: King Herod's Palace, Masada, Israel.
                  International Journal of Rock Mechanics and
                  Mining Sciences Vol.41, pp.
!                 813-832.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" width="20" alt=
!                 "download icon" height="21" /></a></b></i>
                </p>
              </li>
--- 152,165 ----
                <p class="c16">
                  <span class="author">Hatzor, Y. H., Y. Zaslavsky, A.
!                 A. Arzi, and A. Shapira</span>. 2004. 
!                 <span class="title">Dynamic stability
                  analysis of jointed rock slopes using the DDA
!                 method: King Herod's Palace, Masada, Israel</span>.
                  International Journal of Rock Mechanics and
                  Mining Sciences Vol.41, pp.
!                 813-832.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" width="20" alt=
!                 "download icon" height="21" /></a>
                </p>
              </li>
***************
*** 161,167 ****
                <p class="c16">
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
!                 and Sitar, N. 2002. Dynamic block displacement
                  prediction - validation of DDA using analytical
!                 solutions and shaking table experiments.
                  Stability of Rock Structures: Proceedings of the
                  5<sup>th</sup> International Conference on
--- 167,174 ----
                <p class="c16">
                  <span class="author">Tsesarsky, M., Hatzor, Y. H.
!                 and Sitar, N.</span>, 2002. 
!                 <span class="title">Dynamic block displacement
                  prediction - validation of DDA using analytical
!                 solutions and shaking table experiments</span>.
                  Stability of Rock Structures: Proceedings of the
                  5<sup>th</sup> International Conference on
***************
*** 176,200 ****
              <li>
                <p class="c16">
!                 <span class="author">Hatzor, Y. H. and A. Feintuch,
!                 2001. The validity of dynamic displacement
!                 prediction using DDA.  International Journal of
                  Rock Mechanics and Mining Sciences. Vol. 38, No.
!                 4, pp. 599-606.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Hatzor, Y. H. and R. Benary,
!                 1998. Stability of a laminated Voussoir beam:
                  back analysis of a historic roof collapse using
!                 DDA. International Journal of Rock Mechanics and
                  Mining Sciences., Vol. 35, No. 2, pp.
!                 165-181.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
--- 183,208 ----
              <li>
                <p class="c16">
!                 <span class="author">Hatzor, Y. H. and A. Feintuch</span>,
!                 2001. <span class="title">The validity of dynamic displacement
!                 prediction using DDA</span>.  International Journal of
                  Rock Mechanics and Mining Sciences. Vol. 38, No.
!                 4, pp. 599-606.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
                </p>
              </li>
              <li>
                <p class="c16">
!                 <span class="author">Hatzor, Y. H. and R. Benary</span>,
!                 1998. <span class="title">
!                 Stability of a laminated Voussoir beam:
                  back analysis of a historic roof collapse using
!                 DDA</span>. International Journal of Rock Mechanics and
                  Mining Sciences., Vol. 35, No. 2, pp.
!                 165-181.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
                </p>
              </li>
***************
*** 210,218 ****
                  Analysis of Discontinuous Deformation (ed. M.
                  MacLaughlin and N. Sitar), Honolulu,
!                 Hawaii,<span class="c18">pp. 121-136,
!                 2005.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
--- 218,226 ----
                  Analysis of Discontinuous Deformation (ed. M.
                  MacLaughlin and N. Sitar), Honolulu,
!                 Hawaii, pp. 121-136,
!                 2005.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
                </p>
              </li>
***************
*** 224,233 ****
                  "title">Structural stability of historic
                  underground openings in rocks: two case studies
!                 from Israel.</span> In: <span class=
!                 "venue">Stavros, K.  Ed.
                  Fracture and Failure of Natural Building Stones
!                 (ed.S.K. Kourkoulis)</span> <span lang="IT"
!                 class="c19" xml:lang="IT">, Kluwer Academic
!                 Publishers.</span> <a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
--- 232,239 ----
                  "title">Structural stability of historic
                  underground openings in rocks: two case studies
!                 from Israel.</span> In: Stavros, K.  Ed.
                  Fracture and Failure of Natural Building Stones
!                 (ed.S.K. Kourkoulis), Kluwer Academic
!                 Publishers.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
***************
*** 238,252 ****
                <p class="c20">
                  <span class="author">Tsesarsky, M. Hatzor, Y. H.,
!                 Leviathan, Saltzman, U., Sokolowsky, M. 2005.
!                 Structural control on the stability of
!                 overhanging, discontinuous rock slopes. 40th U.S.
                  Symposium on Rock Mechanics (USRMS): Rock
                  Mechanics for Energy, Mineral and Infrastructure
                  Development in the Northern Regions. Anchorage,
                  Alaska, June 25-29, 2005. CD-ROM paper ARMA/USRMS
!                 05-771.</span><i><b><a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
--- 244,258 ----
                <p class="c20">
                  <span class="author">Tsesarsky, M. Hatzor, Y. H.,
!                 Leviathan, Saltzman, U., Sokolowsky, M</span>. 2005.
!                 <span class="title">Structural control on the stability of
!                 overhanging, discontinuous rock slopes</span>. 40th U.S.
                  Symposium on Rock Mechanics (USRMS): Rock
                  Mechanics for Energy, Mineral and Infrastructure
                  Development in the Northern Regions. Anchorage,
                  Alaska, June 25-29, 2005. CD-ROM paper ARMA/USRMS
!                 05-771.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
                </p>
              </li>
***************
*** 258,270 ****
                  underground openings</span>. In: Development and
                  Application of Discontinuous Modelling for Rock
!                 Engineering:<span class="c18">ICADD - 6,
                  Proceedings of  the 6<sup>th</sup> International
                  Conference on Analysis of Discontinuous
                  Deformation (ed. M. Lu),  Balkema Publishers,
!                 Lisse, 93-101, 2003.</span><i><b><a class="c13"
                  href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
                </p>
              </li>
--- 264,276 ----
                  underground openings</span>. In: Development and
                  Application of Discontinuous Modelling for Rock
!                 Engineering: ICADD - 6,
                  Proceedings of  the 6<sup>th</sup> International
                  Conference on Analysis of Discontinuous
                  Deformation (ed. M. Lu),  Balkema Publishers,
!                 Lisse, 93-101, 2003.<a class="c13"
                  href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
                </p>
              </li>
***************
*** 290,297 ****
                  <span class="author">Hatzor, Y, H.</span>,
                  <span class="title">The Vousoir beam reaction
!                 curve. ICADD-3, Proceedings of the 3rd  Intl.
                  Con. On Analysis of Discontinuous Deformation
                  (ed. B. Amadei) ARMA, Alexandria, pp. 117-126,
!                 1999.</span> <a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"
--- 296,303 ----
                  <span class="author">Hatzor, Y, H.</span>,
                  <span class="title">The Vousoir beam reaction
!                 curve</span>. ICADD-3, Proceedings of the 3rd  Intl.
                  Con. On Analysis of Discontinuous Deformation
                  (ed. B. Amadei) ARMA, Alexandria, pp. 117-126,
!                 1999.<a class="c13" href=
                  "http://www.bgu.ac.il/geol/hatzor"><img border=
                  "0" src="Images/list.gif" alt="download icon"

[Dda-cvs] htdocs menu.php,1.2,1.3

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv26819

Modified Files:
	menu.php 
Log Message:
About half through with site update.

Index: menu.php
===================================================================
RCS file: /cvsroot/dda/htdocs/menu.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** menu.php	8 Jul 2006 19:35:46 -0000	1.2
--- menu.php	8 Jul 2006 19:44:22 -0000	1.3
***************
*** 26,31 ****
              <li>
                <p class="c4">
!                 <a class="c12" href=
!                 "Pages/Members_Page.htm">Members</a>
                </p>
              </li>
--- 26,30 ----
              <li>
                <p class="c4">
!                 <a class="c12" href="members.php">Members</a>
                </p>
              </li>
***************
*** 43,48 ****
              <li>
                <p class="c4">
!                 <a class="c12" href=
!                 "Pages/Photos_Page.htm">Photos</a>
                </p>
              </li>
--- 42,46 ----
              <li>
                <p class="c4">
!                 <a class="c12" href="photos.php">Photos</a>
                </p>
              </li>

[Dda-cvs] htdocs dda.js,NONE,1.1

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24451

Added Files:
	dda.js 
Log Message:
Initial javascript code for dda.:

--- NEW FILE: dda.js ---

/**
 * Main javascript controls for dda web pages.
 */

//document.write("Foobar");

[Dda-cvs] htdocs cablebolt.html, NONE, 1.1 dda.css, 1.1, 1.2 header.php, 1.1, 1.2 index.php, 1.7, 1.8 link.php, 1.1, 1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24110

Modified Files:
	dda.css header.php index.php link.php 
Added Files:
	cablebolt.html 
Log Message:
About half through with site update.

Index: dda.css
===================================================================
RCS file: /cvsroot/dda/htdocs/dda.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** dda.css	8 Jul 2006 16:09:08 -0000	1.1
--- dda.css	8 Jul 2006 19:36:28 -0000	1.2
***************
*** 1,30 ****
  
  
! p.c2 {text-align: center}
  
  p.c4 {font-weight: bold; line-height: 150%; text-align: justify}
- 
  p.c6 {line-height: 150%; text-align: justify}
  
- p.c9 {color: #0000FF; font-family: Times New Roman; 
-        line-height: 150%; text-align: justify}
  
! p.c10 {text-align: justify}
  
  p.c11 {font-weight: bold}
  
  
  
  
  span.c1 {font-size:36.0pt}
  span.c8 {color: #000000; font-size: 120%}
  
  
  
  
!  
! a.c5 {color: #000000; font-family: Times New Roman; font-size: 120%}
  a.c3 {color: #000000; font-family: Arial; font-size: 120%}
  a.c7 {color: #000000; font-size: 120%}
  
  a.c12 {color: blue; 
--- 1,96 ----
  
+ h3.c3 {color: #0000FF; font-family: Arial; font-size: larger; text-align: center}
  
! /* This is used in the "featured project" area, the
!    indentation should be dealt with using a div element
!    instead.
!    */
! h4.feature { color: red;
!              text-indent: 4em;
! }
  
+ p.c1 {font-family: Times New Roman; font-size: larger; text-align: center}
+ p.c2 {text-align: center}
+ p.c3 {line-height: 150%; text-align: justify}
  p.c4 {font-weight: bold; line-height: 150%; text-align: justify}
  p.c6 {line-height: 150%; text-align: justify}
  
  
! p.c7 {color: #0000FF; font-family: Times New Roman; line-height: 150%; text-align: justify}
! 
! p.c8 {font-weight: bold; text-align: justify}
! 
! p.c9 {
!    color: #0000FF; 
!    font-family: Times New Roman; 
!    line-height: 150%; 
!    text-align: justify;
! }
! 
  
+ p.c10 {text-align: justify}
  p.c11 {font-weight: bold}
+ p.c12 {margin-bottom: 16px}
  
+ p.c17 {margin-bottom: 16px; text-align: justify}
  
  
+ span.author {
+    font-family: Arial; 
+    color: green; 
+    font-size: 50%;
+ }
+ 
+ span.title { 
+    font-family: Times New Roman;
+    color: purple;
+    font-size: 120%;
+    font-style: italic;
+ }
+ 
+ span.venue {
+    font-size: 12.0pt; 
+    font-family: Times New Roman;
+    color: orange;
+ }
  
  span.c1 {font-size:36.0pt}
+ span.c2 {color: #000000}
+ span.c6 {color: #000000; font-size: 120%}
  span.c8 {color: #000000; font-size: 120%}
+ span.c10 {font-family: Times New Roman; font-size: 12.0pt; color: black}
+ span.c11 {font-size: 12pt; color: black}
  
+ span.c12 {font-family: Times New Roman; color: green;}
  
+ span.c13 {font-size: 12.0pt; color: black}
+ span.c14 {font-family:"Times New Roman"}
+ span.c15 {font-family: Times New Roman; color: purple;}
  
+ span.c16 {font-size: 12.0pt; font-family: Arial; color: black}
  
! span.c17 {font-size: 12pt; font-family: TimesNewRomanPSMT}
! 
! span.c18 {font-family:Arial;color:orange; font-size: 12pt;}
! 
! span.c19 {font-size: 12.0pt; 
!           font-family: Times New Roman;
!           color: yellow;
! }
! 
! 
! 
! 
! 
! 
! a.c1 {color: #000000; text-decoration: none} 
! a.c2 {color: #000000; font-family: Arial; font-size: 120%}
  a.c3 {color: #000000; font-family: Arial; font-size: 120%}
+ /* a.c4 {color: #000000; font-family: Times New Roman; font-size: 120%}*/
+ a.c4 {color: #000000; font-family: Arial; font-size: 120%}
+ a.c5 {color: #000000; font-size: 120%}
+ a.c6 {color: #000000; font-family: Times New Roman; font-size: 120%}
  a.c7 {color: #000000; font-size: 120%}
+ a.c9 {color: blue; text-decoration: underline; text-underline: single}
  
  a.c12 {color: blue; 
***************
*** 34,35 ****
--- 100,120 ----
         font-size: 120%;
  }
+ 
+ a.c13 {font-family: Times New Roman; 
+        color: blue;
+        font-size: 120%
+ }
+ 
+ 
+ /*
+ p.c5 {line-height: 150%; text-align: justify}
+ p.c23 {margin-left: .25in}
+ p.c22 {font-style: italic; text-align: justify}
+ p.c21 {text-align: justify}
+ p.c20 {line-height: 150%; margin-bottom:12px}
+ p.c16 {line-height: 150%; margin-bottom: 12px; text-align: justify}
+ p.c14 {margin-bottom: 12px; text-align: justify}
+ p.c11 {font-family: Times New Roman; text-align: justify}
+ p.c10 {font-family: Times New Roman; font-weight: bold; text-align: justify}
+ 
+ */
\ No newline at end of file

Index: link.php
===================================================================
RCS file: /cvsroot/dda/htdocs/link.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** link.php	8 Jul 2006 16:10:29 -0000	1.1
--- link.php	8 Jul 2006 19:36:28 -0000	1.2
***************
*** 1,128 ****
! <html>
  
! <head>
! <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
! <meta name="ProgId" content="FrontPage.Editor.Document">
! <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
! <title>Link</title>
! </head>
  
! <body>
  
- <font FACE="Arial" SIZE="4"><i><b>
- <table border="4" width="100%" id="table1" cellpadding="10">
-   <tr>
-     <td width="17%" valign="top" bgcolor="#CACAFF">
-     &nbsp;</td>
-     <td width="78%" bgcolor="#CACAFF"><font FACE="Times New Roman">
-     <p align="center"><font size="7">Links</font></td>
-   </tr>
-   <tr>
-     <td width="17%" valign="top" bgcolor="#CACAFF">
-     <b>
-     <font FACE="Arial" SIZE="4">
-     <ul>
-       <li>
-       <p align="justify" style="line-height: 150%">
-         <font FACE="Times New Roman">
-         <a href="../index.htm"><font color="#000000" size="4">Home page</font></a></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%">
-         <font FACE="Times New Roman">
-         <a href="Research_Page.htm"><font color="#000000" size="4">Research</font></a></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%">
-           <font color="#0000FF" FACE="Times New Roman">
-       	<a href="Download_Page.htm"><font color="#000000" size="4">Download</font></a><font color="#000000" size="4">s</font></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%">
-       <font face="Times New Roman">
-       <a href="Members_Page.htm"><font color="#000000" size="4">Members</font></a></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%">
-       <font FACE="Times New Roman">
-       <a href="References_Page.htm"><font color="#000000" size="4">References</font></a></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
- 		<a href="Links_Page.htm"><font color="#000000" size="4">Links</font></a></font></li>
-       <li>
-       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
- 		<a href="Photos_Page.htm"><font color="#000000" size="4">Photos</font></a></font></li>
-     </ul>
- </font></b>
- 	<p>&nbsp;</td>
-     </font>
  
- <font SIZE="4">
-     <td width="78%"><font FACE="Times New Roman" SIZE="3">
  
  
! 	<p align="justify"><b>Useful Links:</b></p>
! 	<ul>
! 		<li>
! 		<p style="margin-bottom: 16px">
! 		<span style="font-family: Times New Roman; font-size: 12.0pt; color: black">
! 		<a style="color: blue; text-decoration: underline; text-underline: single" href="http://sourceforge.net/projects/dda/">
! 		SourceForge.net: Discontinuous Deformation Analysis</a> </span>
! 		<span style="font-size: 12pt; color: black">The world's largest 
! 		development and download repository of Open Source code and 
! 		applications.</span></li>
! 		<li>
! 		<p style="margin-bottom: 16px">
! 		<span style="font-size: 12.0pt; color: black">
! 		<a target="_blank" style="color: blue; text-decoration: underline; text-underline: single" href="http://www.ce.berkeley.edu/geo/research/DDA/index.html">
! 		DDA for Windows 95/NT (Discontinous Deformation Analysis)</a> Dave 
! 		Doolin and Nicholas Sitar.</span></li>
! 		<li>
! 		<p align="justify" style="margin-bottom: 16px">
! 		<span style="font-size: 12.0pt; font-family: Arial; color: black">
! 		<a style="color: blue; text-decoration: underline; text-underline: single" href="http://www.itasca.ca/">
! 		<span style="font-family:&quot;Times New Roman&quot;">Itasca</span><span style="font-family: Times New Roman"> 
! 		Consulting Canada Inc.</span></a><span style="font-family: Times New Roman">
! 		</span></span><span style="font-size: 12pt; color: black">mine 
! 		engineering, design, sequencing, rock mechanics, ground control, 
! 		instrumentation, consulting, modeling.</span></li>
! 		<li>
! 		<p align="justify" style="margin-bottom: 16px">
! 		<span style="font-family:Arial;color:black">
! 		<a style="color: blue; text-decoration: underline; text-underline: single" href="http://www.rocscience.com/">
! 		<span style="font-family:&quot;Times New Roman&quot;">Rocscience - Slope 
! 		Stability Software, Geotechnical software</span></a></span><span style="color: black">
! 		</span><span style="font-size: 12pt; color: black">slope stability 
! 		software, rock engineering, rocscience, rockscience, examine3D, 
! 		examine2D, examinetab, dips, rocfall, rocdata, unwedge, swedge, slide, 
! 		...</span></li>
! 		<li>
! 		<p align="justify" style="margin-bottom: 16px">
! 		<span style="font-size: 12.0pt; font-family: Times New Roman">
! 		<a href="http://www.rockfield.co.uk">Rockfield Software - World leaders 
! 		in Advanced Finite Element</a> </span>
! 		<span style="font-size: 12pt; color: black">Rockfield Software - 
! 		Developers &amp; Suppliers of Finite Element Discrete Element Software 
! 		Systems and Numerical Analysis Consultancy Service.</span></li>
! 		<li>
! 		<p align="justify" style="margin-bottom: 16px">
! 		<span style="font-family: Times New Roman; font-size: 12.0pt; color: black">
! 		<a style="color: blue; text-decoration: underline; text-underline: single" href="http://www.ansys.com/">
! 		Welcome to ANSYS, Inc. - Corporate Homepage</a> </span>
! 		<span style="font-size: 12pt; color: black">Welcome to ANSYS, Inc. - 
! 		computer-aided engineering technology and engineering design analysis 
! 		software products and services.<br>
! 		<br>
! &nbsp;</span></li>
! 	</ul>
! 	<p align="justify">&nbsp;</p>
! 	</font>
! 	</font>
  
! <font FACE="Arial" SIZE="4">
! 	<p>&nbsp;</td>
!   </tr>
! </table>
! </font>
  
- </b></i>
  
- </body>
  
! </html>
\ No newline at end of file
--- 1,119 ----
! <!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>
!       Useful DDA Links on the Web
!     </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">Links</span>
!           </p>
!         </td>
  
!       </tr>
  
  
  
!       <tr>
! 
!         <td width="17%" valign="top" bgcolor="#CCCCFF">
!       <?php
!         include("menu.php");
!       ?>
!         </td>
! 
! 
!         <td width="78%">
! 
!           <h2>Useful Links</h2>
! 
!           <ul>
!             <li>
!               <p class="c12">
!                 <span class="c10"><a class="c9" href=
!                 "http://sourceforge.net/projects/dda/">SourceForge.net:
!                 Discontinuous Deformation Analysis</a></span>
!                 <span class="c11">The world's largest development
!                 and download repository of Open Source code and
!                 applications.</span>
!               </p>
!             </li>
!             <li>
!               <p class="c12">
!                 <span class="c13"><a target="_blank" class="c9"
!                 href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/index.html">
!                 DDA for Windows 95/NT (Discontinous Deformation
!                 Analysis)</a> Dave Doolin and Nicholas
!                 Sitar.</span>
!               </p>
!             </li>
!             <li>
!               <p class="c17">
!                 <span class="c16"><a class="c9" href=
!                 "http://www.itasca.ca/"><span class=
!                 "c14">Itasca</span> <span class="c15">Consulting
!                 Canada Inc.</span></a></span> <span class=
!                 "c11">mine engineering, design, sequencing, rock
!                 mechanics, ground control, instrumentation,
!                 consulting, modeling.</span>
!               </p>
!             </li>
!             <li>
!               <p class="c17">
!                 <span class="c18"><a class="c9" href=
!                 "http://www.rocscience.com/"><span class=
!                 "c14">Rocscience - Slope Stability Software,
!                 Geotechnical software</span></a></span>
!                 <span class="c11">slope stability software, rock
!                 engineering, rocscience, rockscience, examine3D,
!                 examine2D, examinetab, dips, rocfall, rocdata,
!                 unwedge, swedge, slide, ...</span>
!               </p>
!             </li>
!             <li>
!               <p class="c17">
!                 <span class="c19"><a href=
!                 "http://www.rockfield.co.uk">Rockfield Software -
!                 World leaders in Advanced Finite
!                 Element</a></span> <span class="c11">Rockfield
!                 Software - Developers &amp; Suppliers of Finite
!                 Element Discrete Element Software Systems and
!                 Numerical Analysis Consultancy Service.</span>
!               </p>
!             </li>
!             <li>
!               <p class="c17">
!                 <span class="c10"><a class="c9" href=
!                 "http://www.ansys.com/">Welcome to ANSYS, Inc. -
!                 Corporate Homepage</a></span> <span class=
!                 "c11">Welcome to ANSYS, Inc. - computer-aided
!                 engineering technology and engineering design
!                 analysis software products and services.<br />
!                 <br />
!                  </span>
!               </p>
!             </li>
!           </ul>
!         </td>
!       </tr>
!     </table>
!   </body>
! </html>

Index: header.php
===================================================================
RCS file: /cvsroot/dda/htdocs/header.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** header.php	8 Jul 2006 16:10:29 -0000	1.1
--- header.php	8 Jul 2006 19:36:28 -0000	1.2
***************
*** 4,13 ****
    <link rel="SHORTCUT ICON" href="./Images/favicon.ico" />
  
!     <meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
!     <meta name="ProgId" content="FrontPage.Editor.Document" />
! 
!     <meta name="author" content="Roozbeh Grayeli">
!     <meta name="author" content="David M. Doolin">
  
!     <meta http-equiv="Content-Type" content=
!     "text/html; charset=us-ascii" />
--- 4,12 ----
    <link rel="SHORTCUT ICON" href="./Images/favicon.ico" />
  
!   <meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
!   <meta name="ProgId" content="FrontPage.Editor.Document" />
!   <meta name="author" content="Roozbeh Grayeli">
!   <meta name="author" content="David M. Doolin">
!   <meta http-equiv="Content-Type" content="text/html; charset=us-ascii" />
  
!   <script src="dda.js"></script>
\ No newline at end of file

--- NEW FILE: cablebolt.html ---
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
  <head>
    <title>Cable bolting in DDA</title>
  </head>

  <body>
    <h4 class="feature">Cable bolting in DDA</h4>


          <p class="c2" dir="ltr">
            <img border="0" src="Images/cableu.jpg" width="240"
            height="316" /><img border="0" src=
            "Images/cablew.jpg" width="240" height="315" />
          </p>
          <p class="c2" dir="ltr">
             (a)                                                            
            (b)
          </p>
          <p class="c2">
            Axial load along the cable bolt that installed at
            roof of<br />
            underground excavation: (a) without plate and (b)
            with plate (<a class="c12" href=
            "Pages/References_Page.htm#Moosavi">M. Moosavi, R.
            Grayeli</a>)<b>.</b>
          </p>
          <p class="c2" dir="ltr">
             
          </p>

  </body>
</html>

Index: index.php
===================================================================
RCS file: /cvsroot/dda/htdocs/index.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** index.php	8 Jul 2006 16:08:04 -0000	1.7
--- index.php	8 Jul 2006 19:36:28 -0000	1.8
***************
*** 22,29 ****
--- 22,31 ----
          
          <td width="76%" bgcolor="#CCCCFF">
+ 
            <p class="c2">
              <span class="c1">Discontinuous Deformation
              Analysis</span>
            </p>
+ 
          </td>
  
***************
*** 40,44 ****
       
          <td width="78%">
!           <h2>What is DDA?</h2>
  
            <p class="c10">
--- 42,46 ----
       
          <td width="78%">
!           <h2 class="c11">What is DDA?</h2>
  
            <p class="c10">
***************
*** 57,84 ****
            </p>
  
! 	  <!-- TODO: Move this to a file, use php include
! 	   to allow other things to get swapped out.
! 	   -->
  
-           <p class="c2" dir="ltr">
-             <img border="0" src="Images/cableu.jpg" width="240"
-             height="316" /><img border="0" src=
-             "Images/cablew.jpg" width="240" height="315" />
-           </p>
-           <p class="c2" dir="ltr">
-              (a)                                                            
-             (b)
-           </p>
-           <p class="c2">
-             Axial load along the cable bolt that installed at
-             roof of<br />
-             underground excavation: (a) without plate and (b)
-             with plate (<a class="c12" href=
-             "Pages/References_Page.htm#Moosavi">M. Moosavi, R.
-             Grayeli</a>)<b>.</b>
-           </p>
-           <p class="c2" dir="ltr">
-              
-           </p>
          </td>
        </tr>
--- 59,81 ----
            </p>
  
!           <h2 class="c11">Featured project</h2>
! 
! <p class="c10">
! DDA has been used for a wide variety of engineering analyses.
! We are in the process of distilling some of the most interesting 
! and relevant projects employing DDA to illustrate the elegance 
! if discrete element modeling using DDA.
! </p>
! 
! <!-- Each "Featured Project" should conform to the same basic
! template providing who, what, where, when, why and how,
!  with starting and ending geometry configurations, and 
! one or two graphs showing numerical behavior of simulation.
!  -->
!             <?php
!               include("cablebolt.html");
!             ?>
! 
  
          </td>
        </tr>

[Dda-cvs] htdocs download.php,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24096

Modified Files:
	download.php 
Log Message:
About half through with site update.

Index: download.php
===================================================================
RCS file: /cvsroot/dda/htdocs/download.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** download.php	8 Jul 2006 16:10:29 -0000	1.1
--- download.php	8 Jul 2006 19:36:15 -0000	1.2
***************
*** 1,246 ****
! <html>
! 
! <head>
! <meta http-equiv="Content-Language" content="en-us">
! <meta name="GENERATOR" content="Microsoft FrontPage 6.0">
! <meta name="ProgId" content="FrontPage.Editor.Document">
! <meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
! <title>Download</title>
! <style>
! <!--
!  li.MsoNormal
! 	{mso-style-parent:"";
! 	margin-bottom:.0001pt;
! 	font-size:12.0pt;
! 	font-family:"Times New Roman";
! 	margin-left:0in; margin-right:0in; margin-top:0in}
! span.grame
! 	{}
! span.spelle
! 	{}
! -->
! </style>
! </head>
! 
! <body>
! 
! 
! <i><b>
! <table border="4" width="100%" id="table1" cellpadding="10">
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     &nbsp;</td>
!     <font FACE="Arial" SIZE="4">
!     <td width="78%" bgcolor="#CACAFF"><font FACE="Times New Roman" SIZE="7">
!     <p align="center"><font color="#0000FF" FACE="Times New Roman">
! <a href="Download_Page.htm" style="text-decoration: none"><font color="#000000">
! Download</font></a><font color="#000000">s</font></font></td>
!   </tr>
!   <tr>
!     <td width="17%" valign="top" bgcolor="#CACAFF">
!     <b>
!     <font FACE="Arial" SIZE="4">
!     <ul>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="../index.htm"><font color="#000000" size="4">Home page</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!         <font FACE="Times New Roman">
!         <a href="Research_Page.htm"><font color="#000000" size="4">Research</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!           <font color="#0000FF" FACE="Times New Roman">
!       	<a href="Download_Page.htm"><font color="#000000" size="4">Download</font></a><font color="#000000" size="4">s</font></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font face="Times New Roman">
!       <a href="Members_Page.htm"><font color="#000000" size="4">Members</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%">
!       <font FACE="Times New Roman">
!       <a href="References_Page.htm"><font color="#000000" size="4">References</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Links_Page.htm"><font color="#000000" size="4">Links</font></a></font></li>
!       <li>
!       <p align="justify" style="line-height: 150%"><font face="Times New Roman">
! 		<a href="Photos_Page.htm"><font color="#000000" size="4">Photos</font></a></font></li>
!     </ul>
! </font></b>
! 	<p>&nbsp;</td>
!     <td width="78%"><font FACE="Times New Roman" SIZE="3">
! 
! 
! 	</font>
! 	<p align="justify"><b><font face="Times New Roman">DDA's Download link:</font></b><ul>
! 		<li>
! 		<p align="justify"><font face="Times New Roman">Latest version of DDA created by members of this groups (<a href="http://prdownloads.sourceforge.net/dda/InstallDDA.zip?download">Download</a>)</font></li>
! 		</ul>
! 		<p align="justify"><b><font face="Times New Roman">Useful papers:</font></b></p>
! 		<ul>
! 			<li>
! 			<p align="justify" style="margin-bottom:12px">
! 			<font face="Times New Roman">Sitar, N., and MacLaughlin, M.M., Kinematics 
! 			and Discontinuous Deformation Analysis of Landslide Movement, 
! 			Invited Keynote Lecture, II Panamerican Symposium on Landslides, Rio 
! 			de Janeiro, Nov. 10-14th, 1997.</font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.ce.berkeley.edu/geo/research/DDA/pubs/"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">Sitar, 
! 			N., and MacLaughlin, M.M., Doolin, D.M. and Abbot, T.
! 			Investigation of slope stability kinematics using discontinuous 
! 			deformation analysis. International Journal of Rock Mechanics 
! 			and Mining Sciences, v. 38, pp. 753-762, 2001.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.ce.berkeley.edu/geo/research/DDA/pubs"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman">Doolin, D.M. and Sitar, N.,
! 			Accuracy of the DDA method with respect to a single sliding block. 
! 			In: Rock Mechanics in the National Interest, proceedings of the 38th 
! 			U.S. Rock Mechanics Symposium, Washington D.C., July 5-7, 2001. 
! 			Balkema, Rotterdam, pp. 1429-1435.</font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.ce.berkeley.edu/geo/research/DDA/pubs"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman">Doolin, D.M. and Sitar, N.,
! 			DDAML --- discontinuous deformation dnalysis markup language.Int. 
! 			J. of Rock Mechanics and Mining Sciences, V38, N3, April, 2001, 
! 			467-474.</font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.ce.berkeley.edu/geo/research/DDA/pubs"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman">Sitar, N., and MacLaughlin, M.M.,
! 			Investigation of slope stability kinematics using discontinuous 
! 			deformation analysis. Invited Keynote Lecture, II Panamerican 
! 			Symposium on Landslides, Rio de Janeiro, Nov. 10-14th, 1997.</font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.ce.berkeley.edu/geo/research/DDA/pubs"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman">Tsesarsky, M. <span class="grame">and</span> 
! 			Hatzor, Y. H., 2005. Tunnel roof 
! 			deflection as a function of joint spacing and friction in blocky 
! 			rock masses – a parametric study using Discontinuous Deformation 
! 			Analysis (DDA). Tunneling and Underground Space Technology.</font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">
! 			Tsesarsky M., Hatzor, Y. H. and Sitar N.2005.Dynamic 
! 			Displacement of a Block on an Inclined Plane: Analytical, 
! 			Experimental and DDA Results. Technical Note. Rock Mechanics and 
! 			Rock Engineering. Vol. 38, No. 2, pp. 153-167.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">Hatzor, 
! 			Y. H., Y. Zaslavsky, A. A. Arzi, and A. Shapira. 2004.
! 			Dynamic stability analysis of jointed rock slopes using the DDA 
! 			method: King Herod’s Palace, Masada, Israel. International 
! 			Journal of Rock Mechanics and Mining Sciences Vol.41, pp. 813–832.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">
! 			Tsesarsky, M., Hatzor, Y. H. and Sitar, N. 2002. Dynamic 
! 			block displacement prediction – validation of DDA using analytical 
! 			solutions and shaking table experiments. Stability of Rock 
! 			Structures: Proceedings of the 5<sup>th</sup> International 
! 			Conference on Analysis of Discontinuous Deformation (ed. Y. H. 
! 			Hatzor), Balkema Publishers, Lisse, pp. 195 – 203.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">Hatzor, 
! 			Y. H. and A. Feintuch, 2001. The validity 
! 			of dynamic displacement prediction using DDA. &nbsp;International 
! 			Journal of Rock Mechanics and Mining Sciences. Vol. 38, No. 4, pp. 
! 			599-606.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12.0pt; font-family: Times New Roman">Hatzor, 
! 			Y. H. and R. Benary, 1998. Stability of a 
! 			laminated Voussoir beam: back analysis of a historic roof collapse 
! 			using DDA. International Journal of Rock Mechanics and Mining 
! 			Sciences., Vol. 35, No. 2, pp. 165-181.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman">
! 			<span style="font-size: 12pt; font-family: TimesNewRomanPSMT">Kamai, 
! 			R. and Hatzor, Y.H. 2005.
! 			Dynamic back analysis of structural failures in archeological sites 
! 			to obtain paleo-seismic parameters using DDA. Stability Analyses 
! 			using Discontinuous Methods: Proceedings of the 7<sup>th</sup> 
! 			International Conference on Analysis of Discontinuous Deformation 
! 			(ed. M. MacLaughlin and N. Sitar), Honolulu, Hawaii, </span>
! 			<span style="font-size: 12pt">pp. 121-136.</span></font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span lang="IT" style="font-size: 12pt; font-family: Times New Roman">
! 			Hatzor, Y. H., Tsesarsky, M. And Eimermacher, R. C. 2006.
! 			Structural stability of historic underground openings in rocks: two 
! 			case studies from Israel. &nbsp;In: </span><span class="spelle">
! 			<span style="font-size: 12pt; font-family: Times New Roman">Stavros</span></span><span style="font-size: 12pt; font-family: Times New Roman"> 
! 			K. &nbsp;Ed. Fracture and Failure of Natural Building Stones (<span class="spelle">ed.S</span>.
! 			<span class="grame">K. </span><span class="spelle">Kourkoulis</span><span class="grame">)</span></span><span class="grame"><span lang="IT" style="font-size: 12pt; font-family: Times New Roman">, 
! 			Kluwer Academic Publishers.</span></span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%">
! 			<font face="Times New Roman"><span style="font-size: 12pt">Tsesarsky, 
! 			M. <span class="grame">and</span> Hatzor, Y. H., 2005. Tunnel roof 
! 			deflection as a function of joint spacing and friction in blocky 
! 			rock masses – a parametric study using Discontinuous Deformation 
! 			Analysis (DDA). Tunneling and Underground Space Technology.</span></font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12pt; font-family: Times New Roman">
! 			Tsesarsky, M. Hatzor, Y. H., Leviathan, Saltzman, U., Sokolowsky, M. 
! 			2005.
! 			Structural control on the stability of overhanging, discontinuous 
! 			rock slopes. 40th U.S. Symposium on Rock Mechanics (USRMS): Rock 
! 			Mechanics for Energy, Mineral and Infrastructure Development in the 
! 			Northern Regions. Anchorage, Alaska, June 25-29, 2005. CD-ROM paper 
! 			ARMA/USRMS 05-771.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman"><span style="font-size: 12pt">Tsesarsky, 
! 			M. and Hatzor, Y. H. 2003.
! 			Deformation and kinematics of vertically jointed rock layers in 
! 			underground openings. In: Development and Application of 
! 			Discontinuous Modelling for Rock Engineering:</span><span style="font-size: 12pt; color: blue">
! 			</span><span style="font-size: 12pt">ICADD – 6, Proceedings of&nbsp; the 
! 			6<sup>th</sup> International Conference on Analysis of Discontinuous 
! 			Deformation (ed. M. Lu),&nbsp; Balkema Publishers, Lisse, 93-101.</span></font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<font face="Times New Roman"><span style="font-size: 12pt">Tsesarsky, 
! 			M., Hatzor, Y. H. and Sitar, N. 2002. Dynamic 
! 			block displacement prediction – validation of DDA using analytical 
! 			solutions and shaking table experiments. Stability of Rock 
! 			Structures: Proceedings of the 5<sup>th</sup> International 
! 			Conference on Analysis of Discontinuous Deformation (ed. Y. H. 
! 			Hatzor), Balkema Publishers, Lisse, pp. 195 – 203.</span></font><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 			<li>
! 			<p align="justify" style="line-height: 150%; margin-bottom:12px">
! 			<span style="font-size: 12pt; font-family: Times New Roman">Hatzor, 
! 			Y, H., 1999. The 
! 			Vousoir beam reaction curve. ICADD-3, Proceedings of the 3rd&nbsp; 
! 			Intl. Con. On Analysis of Discontinuous Deformation (ed. B. Amadei) 
! 			ARMA, Alexandria, pp. 117-126.</span><i><b><font face="Times New Roman" SIZE="4"><a href="http://www.bgu.ac.il/geol/hatzor"><img border="0" src="../Images/list.gif" width="20" height="21"></a></font></b></i></li>
! 	</ul>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify"><i><br>
! 	&nbsp;</i> </p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p align="justify">&nbsp;</p>
! 	<p class="MsoNormal" style="margin-left: .25in">&nbsp;</p>
! 	<p>&nbsp;</p>
! 		<p>&nbsp;</p>
! 	<p>&nbsp;</p>
! 		<p>&nbsp;</td>
!   </tr>
! </table>
! </font></b></i>
! 
! </body>
! 
! </html>
\ No newline at end of file
--- 1,306 ----
! <!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>
!       Download
!     </title>
!   </head>
!   <body>
!     <table border="4" width="100%" id="table1" cellpadding="10"
!     summary="Layout table for DDA website">
!       <tr>
!         <td width="17%" valign="top" bgcolor="#CACAFF">
!            
!         </td>
!         <td width="78%" bgcolor="#CACAFF">
!           <p class="c2">
!             <span class="c1">Download</span>
!           </p>
!         </td>
!       </tr>
!       <tr>
!         <td width="17%" valign="top" bgcolor="#CACAFF">
! <?php
!   include("menu.php");
! ?>
!         </td>
!         <td width="78%">
!           <p class="c10">
!             DDA's Download link:
!           </p>
!           <ul>
!             <li>
!               <p class="c11">
!                 Latest version of DDA created by members of this
!                 group ( <a href=
!                 "http://prdownloads.sourceforge.net/dda/InstallDDA.zip?download">
!                 Download</a>)
!               </p>
!             </li>
!           </ul>
!           <p class="c10">
!             Useful papers:
!           </p>
!           <ul>
!             <li>
!               <p class="c14">
!                 <span class="author">Sitar, N., and MacLaughlin,
!                 M.M.</span> , <span class="title">Kinematics and
!                 Discontinuous Deformation Analysis of Landslide
!                 Movement</span> , <span>Invited Keynote Lecture,
!                 II Panamerican Symposium on Landslides, Rio de
!                 Janeiro, Nov. 10-14th, 1997.</span> <a class=
!                 "c13" href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/pubs/">
!                 <img border="0" src="Images/list.gif" alt=
!                 "download icon" width="20" height="21" /></a>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Sitar, N., and MacLaughlin,
!                 M.M., Doolin, D.M. and Abbot, T. Investigation of
!                 slope stability kinematics using discontinuous
!                 deformation analysis. International Journal of
!                 Rock Mechanics and Mining Sciences, v. 38, pp.
!                 753-762, 2001.</span><i><b><a class="c13" href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
!                 <img border="0" src="Images/list.gif" alt=
!                 "download icon" width="20" height=
!                 "21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.,
!                 Accuracy of the DDA method with respect to a
!                 single sliding block. In: Rock Mechanics in the
!                 National Interest, proceedings of the 38th U.S.
!                 Rock Mechanics Symposium, Washington D.C., July
!                 5-7, 2001. Balkema, Rotterdam, pp.
!                 1429-1435.</span><i><b><a class="c13" href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
!                 <img border="0" src="Images/list.gif" alt=
!                 "download icon" width="20" height=
!                 "21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Doolin, D.M. and Sitar, N.,
!                 DDAML --- discontinuous deformation dnalysis
!                 markup language.Int. J. of Rock Mechanics and
!                 Mining Sciences, V38, N3, April, 2001,
!                 467-474.</span><i><b><a class="c13" href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
!                 <img border="0" src="Images/list.gif" alt=
!                 "download icon" width="20" height=
!                 "21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Sitar, N., and MacLaughlin,
!                 M.M., Investigation of slope stability kinematics
!                 using discontinuous deformation analysis. Invited
!                 Keynote Lecture, II Panamerican Symposium on
!                 Landslides, Rio de Janeiro, Nov. 10-14th,
!                 1997.</span><i><b><a class="c13" href=
!                 "http://www.ce.berkeley.edu/geo/research/DDA/pubs">
!                 <img border="0" alt="download icon" src=
!                 "Images/list.gif" width="20" height=
!                 "21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Tsesarsky, M. and Hatzor, Y.
!                 H.</span>, <span class="title">Tunnel roof
!                 deflection as a function of joint spacing and
!                 friction in blocky rock masses - a parametric
!                 study using Discontinuous Deformation Analysis
!                 (DDA)</span>. Tunneling and Underground Space
!                 Technology, 2005.<a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img alt=
!                 "download icon" border="0" src="Images/list.gif"
!                 width="20" height="21" /></a>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Tsesarsky M., Hatzor, Y. H. and
!                 Sitar N.2005.Dynamic Displacement of a Block on
!                 an Inclined Plane: Analytical, Experimental and
!                 DDA Results. Technical Note. Rock Mechanics and
!                 Rock Engineering. Vol. 38, No. 2, pp.
!                 153-167.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img alt=
!                 "download icon" border="0" src="Images/list.gif"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Hatzor, Y. H., Y. Zaslavsky, A.
!                 A. Arzi, and A. Shapira. 2004. Dynamic stability
!                 analysis of jointed rock slopes using the DDA
!                 method: King Herod's Palace, Masada, Israel.
!                 International Journal of Rock Mechanics and
!                 Mining Sciences Vol.41, pp.
!                 813-832.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" width="20" alt=
!                 "download icon" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Tsesarsky, M., Hatzor, Y. H.
!                 and Sitar, N. 2002. Dynamic block displacement
!                 prediction - validation of DDA using analytical
!                 solutions and shaking table experiments.
!                 Stability of Rock Structures: Proceedings of the
!                 5<sup>th</sup> International Conference on
!                 Analysis of Discontinuous Deformation (ed. Y. H.
!                 Hatzor), Balkema Publishers, Lisse, pp. 195 -
!                 203.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Hatzor, Y. H. and A. Feintuch,
!                 2001. The validity of dynamic displacement
!                 prediction using DDA.  International Journal of
!                 Rock Mechanics and Mining Sciences. Vol. 38, No.
!                 4, pp. 599-606.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Hatzor, Y. H. and R. Benary,
!                 1998. Stability of a laminated Voussoir beam:
!                 back analysis of a historic roof collapse using
!                 DDA. International Journal of Rock Mechanics and
!                 Mining Sciences., Vol. 35, No. 2, pp.
!                 165-181.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Kamai, R. and Hatzor,
!                 Y.H.</span> <span class="title">Dynamic back
!                 analysis of structural failures in archeological
!                 sites to obtain paleo-seismic parameters using
!                 DDA.</span> Stability Analyses using
!                 Discontinuous Methods: Proceedings of the
!                 7<sup>th</sup> International Conference on
!                 Analysis of Discontinuous Deformation (ed. M.
!                 MacLaughlin and N. Sitar), Honolulu,
!                 Hawaii,<span class="c18">pp. 121-136,
!                 2005.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span lang="IT" class="author" xml:lang=
!                 "IT">Hatzor, Y. H., Tsesarsky, M. And
!                 Eimermacher, R. C.</span> 2006. <span class=
!                 "title">Structural stability of historic
!                 underground openings in rocks: two case studies
!                 from Israel.</span> In: <span class=
!                 "venue">Stavros, K.  Ed.
!                 Fracture and Failure of Natural Building Stones
!                 (ed.S.K. Kourkoulis)</span> <span lang="IT"
!                 class="c19" xml:lang="IT">, Kluwer Academic
!                 Publishers.</span> <a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
!               </p>
!             </li>
!             <li>
!               <p class="c20">
!                 <span class="author">Tsesarsky, M. Hatzor, Y. H.,
!                 Leviathan, Saltzman, U., Sokolowsky, M. 2005.
!                 Structural control on the stability of
!                 overhanging, discontinuous rock slopes. 40th U.S.
!                 Symposium on Rock Mechanics (USRMS): Rock
!                 Mechanics for Energy, Mineral and Infrastructure
!                 Development in the Northern Regions. Anchorage,
!                 Alaska, June 25-29, 2005. CD-ROM paper ARMA/USRMS
!                 05-771.</span><i><b><a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Tsesarsky, M. and Hatzor, Y.
!                 H.</span>, <span class="title">Deformation and
!                 kinematics of vertically jointed rock layers in
!                 underground openings</span>. In: Development and
!                 Application of Discontinuous Modelling for Rock
!                 Engineering:<span class="c18">ICADD - 6,
!                 Proceedings of  the 6<sup>th</sup> International
!                 Conference on Analysis of Discontinuous
!                 Deformation (ed. M. Lu),  Balkema Publishers,
!                 Lisse, 93-101, 2003.</span><i><b><a class="c13"
!                 href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a></b></i>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Tsesarsky, M., Hatzor, Y. H.
!                 and Sitar, N.</span>, <span class="title">Dynamic
!                 block displacement prediction - validation of DDA
!                 using analytical solutions and shaking table
!                 experiments</span>. Stability of Rock Structures:
!                 Proceedings of the 5<sup>th</sup> International
!                 Conference on Analysis of Discontinuous
!                 Deformation (ed. Y. H. Hatzor), Balkema
!                 Publishers, Lisse, pp. 195 - 203, 2002.<a class=
!                 "c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
!               </p>
!             </li>
!             <li>
!               <p class="c16">
!                 <span class="author">Hatzor, Y, H.</span>,
!                 <span class="title">The Vousoir beam reaction
!                 curve. ICADD-3, Proceedings of the 3rd  Intl.
!                 Con. On Analysis of Discontinuous Deformation
!                 (ed. B. Amadei) ARMA, Alexandria, pp. 117-126,
!                 1999.</span> <a class="c13" href=
!                 "http://www.bgu.ac.il/geol/hatzor"><img border=
!                 "0" src="Images/list.gif" alt="download icon"
!                 width="20" height="21" /></a>
!               </p>
!             </li>
!           </ul>
!         </td>
!       </tr>
!     </table>
!   </body>
! </html>

[Dda-cvs] htdocs research.php,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23758

Modified Files:
	research.php 
Log Message:
About half through with site update.

Index: research.php
===================================================================
RCS file: /cvsroot/dda/htdocs/research.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** research.php	8 Jul 2006 16:11:18 -0000	1.1
--- research.php	8 Jul 2006 19:35:59 -0000	1.2
***************
*** 7,19 ****
          include("header.php");
        ?>
- <!-
-   <link type="text/css" rel="stylesheet" href="dda.css" />
-   <link rel="SHORTCUT ICON" href="./Images/favicon.ico" />
  
-     <meta name="GENERATOR" content="Microsoft FrontPage 6.0" />
-     <meta name="ProgId" content="FrontPage.Editor.Document" />
-     <meta http-equiv="Content-Type" content=
-     "text/html; charset=us-ascii" />
- -->
      <title>
        Research
--- 7,11 ----

[Dda-cvs] htdocs menu.php,1.1,1.2

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv23745

Modified Files:
	menu.php 
Log Message:
About half through with site update.

Index: menu.php
===================================================================
RCS file: /cvsroot/dda/htdocs/menu.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** menu.php	8 Jul 2006 16:10:29 -0000	1.1
--- menu.php	8 Jul 2006 19:35:46 -0000	1.2
***************
*** 21,26 ****
              <li>
                <p class="c4">
!                 <a class="c12" href=
!                 "Pages/Download_Page.htm">Download</a>
                </p>
              </li>
--- 21,25 ----
              <li>
                <p class="c4">
!                 <a class="c12" href="download.php">Download</a>
                </p>
              </li>
***************
*** 33,38 ****
              <li>
                <p class="c4">
!                 <a class="c12" href=
!                 "Pages/References_Page.htm">References</a>
                </p>
              </li>
--- 32,36 ----
              <li>
                <p class="c4">
!                 <a class="c12" href="references.php">References</a>
                </p>
              </li>
***************
*** 40,44 ****
                <p class="c4">
                  <a class="c12" href=
!                 "Pages/Links_Page.htm">Links</a>
                </p>
              </li>
--- 38,42 ----
                <p class="c4">
                  <a class="c12" href=
!                 "link.php">Links</a>
                </p>
              </li>
***************
*** 60,63 ****
--- 58,71 ----
  Last modified: Sat Jul 08 08:20:09 Pacific Daylight Time 2006
  <!-- hhmts end -->
+ 
+ <hr />
+ <a href="http://sourceforge.net">
+ <img src="http://sflogo.sourceforge.net/sflogo.php?group_id=76533&amp;type=1" 
+      width="88" 
+      height="31" 
+      border="0" 
+      alt="SourceForge.net Logo" />
+ </a>
+ 
    </body>
  </html>

[Dda-cvs] htdocs Makefile,NONE,1.1

[David M. D. <do...@us...>]

Update of /cvsroot/dda/htdocs
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv24777

Added Files:
	Makefile 
Log Message:
Added Makefile to with development chores.

--- NEW FILE: Makefile ---



clean:
	rm -rf *~