[Dda-cvs] ntdda/src analysisdata.c, 1.27, 1.28 constants.c, 1.9, 1.10 dda.c, 1.13, 1.14 ddafile.c, 1.6, 1.7 dxf.c, 1.2, 1.3 ghssolver.c, 1.14, 1.15 loadpoint.c, 1.6, 1.7

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

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

Modified Files:
	analysisdata.c constants.c dda.c ddafile.c dxf.c ghssolver.c 
	loadpoint.c 
Log Message:
Cleaned up code in unittests to ensure compile 
under cygwin.

Index: dxf.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/dxf.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** dxf.c	1 Jul 2006 14:35:44 -0000	1.2
--- dxf.c	6 Jul 2006 02:28:27 -0000	1.3
***************
*** 220,224 ****
        jy2[count2] = y2;
        type[count2] = ctype;
!     }
      if (strcmp (str[i], "MTEXT") == 0) {
        if (strcmp (str[i + 9], "62") == 0) {
--- 220,226 ----
        jy2[count2] = y2;
        type[count2] = ctype;
!     }
! 
! 
      if (strcmp (str[i], "MTEXT") == 0) {
        if (strcmp (str[i + 9], "62") == 0) {

Index: analysisdata.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/analysisdata.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** analysisdata.c	7 Mar 2006 05:39:53 -0000	1.27
--- analysisdata.c	6 Jul 2006 02:28:27 -0000	1.28
***************
*** 554,556 ****
  adata_get_grav_accel(Analysisdata * ad){
     return ad->gravaccel;
! }
\ No newline at end of file
--- 554,558 ----
  adata_get_grav_accel(Analysisdata * ad){
     return ad->gravaccel;
! }
! 
! 

Index: dda.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/dda.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** dda.c	7 Mar 2006 05:47:17 -0000	1.13
--- dda.c	6 Jul 2006 02:28:27 -0000	1.14
***************
*** 11,14 ****
--- 11,18 ----
  #include <direct.h>
  #define getcwd _getcwd
+ #define mkdir _mkdir
+ #define putenv _putenv
+ #else 
+ #include <unistd.h>
  #endif
  
***************
*** 188,192 ****
   * done with mkdir.  Smells like a kludge.
   */
!    checkval = _mkdir(outdir);
   
  
--- 192,196 ----
   * done with mkdir.  Smells like a kludge.
   */
!    checkval = mkdir(outdir);
   
  
***************
*** 227,230 ****
--- 231,235 ----
  
  
+ #if 0
  #ifdef STANDALONE
  int 
***************
*** 239,243 ****
  }
  #endif /* STANDALONE */
! 
  
  
--- 244,248 ----
  }
  #endif /* STANDALONE */
! #endif
  
  

Index: ddafile.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/ddafile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ddafile.c	2 Jul 2006 23:07:27 -0000	1.6
--- ddafile.c	6 Jul 2006 02:28:27 -0000	1.7
***************
*** 9,13 ****
--- 9,18 ----
  #include <string.h>
  #include <assert.h>
+ 
+ #ifdef WIN32
  #include <direct.h>
+ #else
+ #include <unistd.h>
+ #endif
  
  #include "dda.h"
***************
*** 389,391 ****
  }
  
! #endif
\ No newline at end of file
--- 394,397 ----
  }
  
! #endif
! 

Index: constants.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/constants.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** constants.c	7 Mar 2006 05:39:53 -0000	1.9
--- constants.c	6 Jul 2006 02:28:27 -0000	1.10
***************
*** 368,376 ****
     printer(stream,I1"</AConstants>\n\n"); 
     /*
!    openclose =  .0002;  /* s0 = .0002  
!    opencriteria = .0000002;  /* f0 = .0000002;  
!    norm_spring_pen = .0004;//g3 = .0004;   /* g3 = .0004;  
!    angle_olap = 3;   /* h1 = 3; 
!    shear_norm_ratio = 2.5;  /* h2 = 2.5; 
     */   
  }
--- 368,376 ----
     printer(stream,I1"</AConstants>\n\n"); 
     /*
!    openclose =  .0002;  // s0 = .0002  
!    opencriteria = .0000002;  // f0 = .0000002;  
!    norm_spring_pen = .0004;//g3 = .0004;   // g3 = .0004;  
!    angle_olap = 3;   // h1 = 3; 
!    shear_norm_ratio = 2.5;  // h2 = 2.5; 
     */   
  }

Index: ghssolver.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/ghssolver.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ghssolver.c	17 Dec 2003 23:36:36 -0000	1.14
--- ghssolver.c	6 Jul 2006 02:28:27 -0000	1.15
***************
*** 991,993 ****
     fprintf(fp.dfile,"\n");
  
! }  /* close writeSolutionVector() */
\ No newline at end of file
--- 991,994 ----
     fprintf(fp.dfile,"\n");
  
! }  /* close writeSolutionVector() */
! 

Index: loadpoint.c
===================================================================
RCS file: /cvsroot/dda/ntdda/src/loadpoint.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** loadpoint.c	17 Dec 2003 23:36:36 -0000	1.6
--- loadpoint.c	6 Jul 2006 02:28:27 -0000	1.7
***************
*** 211,213 ****
  #ifdef __cplusplus
  }
! #endif
\ No newline at end of file
--- 211,214 ----
  #ifdef __cplusplus
  }
! #endif
!