diff --git a/src/nwpw/nwpwlib/io/ascii_io.c b/src/nwpw/nwpwlib/io/ascii_io.c index 68b46d0ddd..06e5a21752 100644 --- a/src/nwpw/nwpwlib/io/ascii_io.c +++ b/src/nwpw/nwpwlib/io/ascii_io.c @@ -58,34 +58,16 @@ static FILE* fd[MAX_UNIT]; /* the file descriptor of the pipe */ ************************************************************************* */ -void FATR ascii_cwrite_ -#if defined(USE_FCD) -(const Integer *unit, _fcd fcd_c, const Integer *n) +void FATR ascii_cwrite_(const Integer *unit, char *c, const Integer *n) { - const char *c = _fcdtocp(fcd_c); - -#else -(const Integer *unit, char *c, const Integer *n) -{ -#endif - int j; for (j=0; j<(*n); ++j) (void) fprintf(fd[*unit],"%c ",c[j]); (void) fprintf(fd[*unit],"\n"); } -void FATR ascii_cread_ -#if defined(USE_FCD) -(const Integer *unit, _fcd fcd_c, const Integer *n) +void FATR ascii_cread_(const Integer *unit, char *c, const Integer *n) { - char *c = _fcdtocp(fcd_c); - -#else -(const Integer *unit, char *c, const Integer *n) -{ -#endif - int j; for (j=0; j<(*n); ++j) (void) fscanf(fd[*unit],"%c ",&c[j]); @@ -151,18 +133,8 @@ void FATR ascii_ishift_fileptr_(const Integer *unit, const Integer *n) #define FUDGE_FACTOR (8) -void FATR ascii_openfile_ -#if defined(USE_FCD) -(const Integer *unit, _fcd fcd_filename, Integer *n1, _fcd fcd_mode, Integer *n2) +void FATR ascii_openfile_(const Integer *unit, char *filename, Integer *n1, char *mode, Integer *n2) { - const char *filename = _fcdtocp(fcd_filename); - const char *mode = _fcdtocp(fcd_mode); - -#else -(const Integer *unit, char *filename, Integer *n1, char *mode, Integer *n2) -{ -#endif - char *file = (char *) malloc(*n1+1); (void) strncpy(file, filename, *n1); diff --git a/src/nwpw/nwpwlib/io/compressed_io.c b/src/nwpw/nwpwlib/io/compressed_io.c index a4279c98df..79f5f294ca 100644 --- a/src/nwpw/nwpwlib/io/compressed_io.c +++ b/src/nwpw/nwpwlib/io/compressed_io.c @@ -32,12 +32,7 @@ #include #include "typesf2c.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define cwrite_ CWRITE #define cread_ CREAD #define iwrite_ IWRITE @@ -68,21 +63,8 @@ static int ascii[MAX_UNIT]; ************************************************************************* */ -void FATR cwrite_ -#if defined(USE_FCD) -(const Integer *unit, - _fcd fcd_c, - const Integer *n) +void FATR cwrite_(const Integer *unit, char *c, const Integer *n) { - const char *c = _fcdtocp(fcd_c); - -#else -(const Integer *unit, - char *c, - const Integer *n) -{ -#endif - if (ascii[*unit]) { int j; @@ -90,25 +72,13 @@ void FATR cwrite_ (void) fprintf(fd[*unit],"%c ",c[j]); (void) fprintf(fd[*unit],"\n"); } - else + else { (void) fwrite(c, sizeof(char), *n, fd[*unit]); + } } -void FATR cread_ -#if defined(USE_FCD) -(const Integer *unit, - _fcd fcd_c, - const Integer *n) +void FATR cread_ (const Integer *unit, char *c, const Integer *n) { - char *c = _fcdtocp(fcd_c); - -#else -(const Integer *unit, - char *c, - const Integer *n) -{ -#endif - if (ascii[*unit]) { int j; @@ -205,25 +175,11 @@ void FATR flush_fileptr_(const Integer *unit) #define FUDGE_FACTOR (8) -void FATR openfile_ -#if defined(USE_FCD) -(const Integer *unit, - _fcd fcd_filename, - Integer *n1, - _fcd fcd_mode, - Integer *n2) +void FATR openfile_(const Integer *unit, + char *filename, Integer *n1, + char *mode, + Integer *n2) { - const char *filename = _fcdtocp(fcd_filename); - const char *mode = _fcdtocp(fcd_mode); - -#else -(const Integer *unit, - char *filename, Integer *n1, - char *mode, - Integer *n2) -{ -#endif - char *file = (char *) malloc(*n1+1); char *rc, *wc; diff --git a/src/nwpw/nwpwlib/ion/shake/pspw_molecule.c b/src/nwpw/nwpwlib/ion/shake/pspw_molecule.c index 07fa6c7d55..e8c966a3eb 100644 --- a/src/nwpw/nwpwlib/ion/shake/pspw_molecule.c +++ b/src/nwpw/nwpwlib/ion/shake/pspw_molecule.c @@ -12,12 +12,7 @@ #include "pspw_bond.h" #include "pspw_molecule.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define pspw_molecule_read_ PSPW_MOLECULE_READ #define pspw_molecule_data_ PSPW_MOLECULE_DATA #define pspw_molecule_end_ PSPW_MOLECULE_END @@ -250,18 +245,8 @@ void FATR pspw_molecule_end_() * * ********************************/ -void FATR pspw_molecule_read_ -#if defined(USE_FCD) -( _fcd fcd_filename, Integer *n1) +void FATR pspw_molecule_read_(char *filename, Integer *n1) { - const char *filename = _fcdtocp(fcd_filename); - -#else -(char *filename, Integer *n1) -{ -#endif - - FILE *fp; int value; int j,m,msize; diff --git a/src/nwpw/nwpwlib/pseudopotential/carter_parse.c b/src/nwpw/nwpwlib/pseudopotential/carter_parse.c index 8df2e243ec..b50808508d 100644 --- a/src/nwpw/nwpwlib/pseudopotential/carter_parse.c +++ b/src/nwpw/nwpwlib/pseudopotential/carter_parse.c @@ -10,58 +10,25 @@ #include "get_word.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define carter_parse_ CARTER_PARSE #endif -void FATR carter_parse_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2, - const _fcd fcd_atom, - Integer *n3) +void FATR carter_parse_(Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2, + char atom[], + Integer *n3) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - char *atom = _fcdtocp(fcd_atom); - -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2,atom,n3) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -char atom[]; -Integer *n3; -{ - -#endif int debug; int lmax_out,locp_out; diff --git a/src/nwpw/nwpwlib/pseudopotential/cpi_parse.c b/src/nwpw/nwpwlib/pseudopotential/cpi_parse.c index a66abbf6fd..2208e978c7 100644 --- a/src/nwpw/nwpwlib/pseudopotential/cpi_parse.c +++ b/src/nwpw/nwpwlib/pseudopotential/cpi_parse.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -13,58 +9,25 @@ extern double cpi_Splint(); extern void cpi_Spline(); -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define cpi_parse_ CPI_PARSE #endif -void FATR cpi_parse_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2, - const _fcd fcd_atom, - Integer *n3) +void FATR cpi_parse_(Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2, + char atom[], + Integer *n3) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - char *atom = _fcdtocp(fcd_atom); - -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2,atom,n3) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -char atom[]; -Integer *n3; -{ - -#endif int debug; int lmax_out,locp_out; diff --git a/src/nwpw/nwpwlib/pseudopotential/hgh_parse.c b/src/nwpw/nwpwlib/pseudopotential/hgh_parse.c index bf5b519244..59821dccdd 100644 --- a/src/nwpw/nwpwlib/pseudopotential/hgh_parse.c +++ b/src/nwpw/nwpwlib/pseudopotential/hgh_parse.c @@ -1,61 +1,26 @@ -/* - $Id$ -*/ - #include #include #include #include "typesf2c.h" #include "get_word.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - #if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) #define hgh_parse_ HGH_PARSE #endif -void FATR hgh_parse_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2) +void FATR hgh_parse_ (Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[] + Integer *n0, + char in_filename[] + Integer *n1, + char out_filename[], + Integer *n2) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -{ - -#endif - int debug,done; int lmax_out,locp_out; double rlocal_out; diff --git a/src/nwpw/nwpwlib/pseudopotential/paw_atom/paw_atom_driver.c b/src/nwpw/nwpwlib/pseudopotential/paw_atom/paw_atom_driver.c index d67d62199b..0c59b6d113 100644 --- a/src/nwpw/nwpwlib/pseudopotential/paw_atom/paw_atom_driver.c +++ b/src/nwpw/nwpwlib/pseudopotential/paw_atom/paw_atom_driver.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -16,59 +12,25 @@ #include "paw_scattering.h" #include "paw_loggrid.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - #if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) #define teter_parse_ PAW_ATOM_DRIVER #endif -void FATR paw_atom_driver_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2, - const _fcd fcd_atom, - Integer *n3) +void FATR paw_atom_driver_(Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2, + char atom[], + Integer *n3) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - char *atom = _fcdtocp(fcd_atom); - -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2,atom,n3) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -char atom[]; -Integer *n3; -{ - -#endif - int debug; int lmax_out,locp_out; double rlocal_out; diff --git a/src/nwpw/nwpwlib/pseudopotential/pspsolve.c b/src/nwpw/nwpwlib/pseudopotential/pspsolve.c index 5c40b746f8..9af9932030 100644 --- a/src/nwpw/nwpwlib/pseudopotential/pspsolve.c +++ b/src/nwpw/nwpwlib/pseudopotential/pspsolve.c @@ -1,6 +1,3 @@ -/* - $Id$ -*/ #include #include #include @@ -18,57 +15,25 @@ **/ #include "rpspsolve.c" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - #if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) #define pspsolve_ PSPSOLVE #endif -void FATR pspsolve_ -#if defined(USE_FCD) - - (Integer * print_ptr, - Integer * debug_ptr, - Integer * lmax_ptr, - Integer * locp_ptr, - double *rlocal_ptr, - Integer * efg_ptr, - const _fcd fcd_sdir_name, - Integer * n9, - const _fcd fcd_dir_name, - Integer * n0, - const _fcd fcd_in_filename, - Integer * n1, const _fcd fcd_out_filename, Integer * n2) +void FATR pspsolve_(Integer *print_ptr, + Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + Integer *efg_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2) { - char *sdir_name = _fcdtocp (fcd_sdir_name); - char *dir_name = _fcdtocp (fcd_dir_name); - char *in_filename = _fcdtocp (fcd_in_filename); - char *out_filename = _fcdtocp (fcd_out_filename); - -#else - - (print_ptr, debug_ptr, lmax_ptr, locp_ptr, rlocal_ptr,efg_ptr, - sdir_name, n9, dir_name, n0, in_filename, n1, out_filename, n2) - Integer *print_ptr; - Integer *debug_ptr; - Integer *lmax_ptr; - Integer *locp_ptr; - double *rlocal_ptr; - Integer *efg_ptr; - char sdir_name[]; - Integer *n9; - char dir_name[]; - Integer *n0; - char in_filename[]; - Integer *n1; - char out_filename[]; - Integer *n2; -{ - -#endif int i, j, k, l, p, Nlinear, Nvalence,Ncore,istate,mch,kb_extra; int debug, print; diff --git a/src/nwpw/nwpwlib/pseudopotential/qmmm_parse.c b/src/nwpw/nwpwlib/pseudopotential/qmmm_parse.c index 6561e90a43..e53d17c4a9 100644 --- a/src/nwpw/nwpwlib/pseudopotential/qmmm_parse.c +++ b/src/nwpw/nwpwlib/pseudopotential/qmmm_parse.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -10,65 +6,30 @@ #include "get_word.h" - -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - #if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) #define qmmm_parse_ QMMM_PARSE #endif -void FATR qmmm_parse_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2, - const _fcd fcd_atom, - Integer *n3) +void FATR qmmm_parse_(Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2, + char atom[], + Integer *n3) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - char *atom = _fcdtocp(fcd_atom); + int debug, + int lmax_out,locp_out, + double rlocal_out, -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2,atom,n3) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -char atom[]; -Integer *n3; -{ - -#endif - - int debug; - int lmax_out,locp_out; - double rlocal_out; - - int lmax; + int lmax, double Zion; /* local psp parameters */ diff --git a/src/nwpw/nwpwlib/pseudopotential/rpspsolve.c b/src/nwpw/nwpwlib/pseudopotential/rpspsolve.c index cf8c282515..f2fe7795d5 100644 --- a/src/nwpw/nwpwlib/pseudopotential/rpspsolve.c +++ b/src/nwpw/nwpwlib/pseudopotential/rpspsolve.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -14,53 +10,24 @@ #include "rpsp.h" #include "debug.h" -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define rpspsolve_ RPSPSOLVE #endif -void FATR rpspsolve_ -#if defined(USE_FCD) - (Integer * print_ptr, - Integer * debug_ptr, - Integer * lmax_ptr, - Integer * locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer * n9, - const _fcd fcd_dir_name, - Integer * n0, - const _fcd fcd_in_filename, - Integer * n1, const _fcd fcd_out_filename, Integer * n2) +void FATR rpspsolve_ (Integer *print_ptr, + Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2) { - char *sdir_name = _fcdtocp (fcd_sdir_name); - char *dir_name = _fcdtocp (fcd_dir_name); - char *in_filename = _fcdtocp (fcd_in_filename); - char *out_filename = _fcdtocp (fcd_out_filename); -#else - - (print_ptr, debug_ptr, lmax_ptr, locp_ptr, rlocal_ptr, - sdir_name, n9, dir_name, n0, in_filename, n1, out_filename, n2) - Integer *print_ptr; - Integer *debug_ptr; - Integer *lmax_ptr; - Integer *locp_ptr; - double *rlocal_ptr; - char sdir_name[]; - Integer *n9; - char dir_name[]; - Integer *n0; - char in_filename[]; - Integer *n1; - char out_filename[]; - Integer *n2; -{ -#endif - int i, j, k, l, p, Nlinear, Nvalence; int debug, print; double *rl, *rhol, **psil, **pspl; diff --git a/src/nwpw/nwpwlib/pseudopotential/teter_parse.c b/src/nwpw/nwpwlib/pseudopotential/teter_parse.c index 52bec5a193..a683e88858 100644 --- a/src/nwpw/nwpwlib/pseudopotential/teter_parse.c +++ b/src/nwpw/nwpwlib/pseudopotential/teter_parse.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -13,60 +9,25 @@ extern double tetercc(); extern double cpi_Splint(); extern void cpi_Spline(); - -#if defined(CRAY) || defined(CRAY_T3D) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define teter_parse_ TETER_PARSE #endif -void FATR teter_parse_ -#if defined(USE_FCD) -(Integer *debug_ptr, - Integer *lmax_ptr, - Integer *locp_ptr, - double *rlocal_ptr, - const _fcd fcd_sdir_name, - Integer *n9, - const _fcd fcd_dir_name, - Integer *n0, - const _fcd fcd_in_filename, - Integer *n1, - const _fcd fcd_out_filename, - Integer *n2, - const _fcd fcd_atom, - Integer *n3) +void FATR teter_parse_ (Integer *debug_ptr, + Integer *lmax_ptr, + Integer *locp_ptr, + double *rlocal_ptr, + char sdir_name[], + Integer *n9, + char dir_name[], + Integer *n0, + char in_filename[], + Integer *n1, + char out_filename[], + Integer *n2, + char atom[], + Integer *n3) { - char *sdir_name = _fcdtocp(fcd_sdir_name); - char *dir_name = _fcdtocp(fcd_dir_name); - char *in_filename = _fcdtocp(fcd_in_filename); - char *out_filename = _fcdtocp(fcd_out_filename); - char *atom = _fcdtocp(fcd_atom); - -#else -(debug_ptr,lmax_ptr,locp_ptr,rlocal_ptr, - sdir_name,n9,dir_name,n0,in_filename,n1,out_filename,n2,atom,n3) -Integer *debug_ptr; -Integer *lmax_ptr; -Integer *locp_ptr; -double *rlocal_ptr; -char sdir_name[]; -Integer *n9; -char dir_name[]; -Integer *n0; -char in_filename[]; -Integer *n1; -char out_filename[]; -Integer *n2; -char atom[]; -Integer *n3; -{ - -#endif - int debug; int lmax_out,locp_out; double rlocal_out; diff --git a/src/nwpw/nwpwlib/utilities/nwpw_emachine.c b/src/nwpw/nwpwlib/utilities/nwpw_emachine.c index fa5760e1cd..1530836cfc 100644 --- a/src/nwpw/nwpwlib/utilities/nwpw_emachine.c +++ b/src/nwpw/nwpwlib/utilities/nwpw_emachine.c @@ -1,7 +1,3 @@ -/* - $Id: nwpw_emachine.c 25745 2014-06-08 07:46:01Z d3y133 $ -*/ - #include #include #include @@ -22,10 +18,6 @@ -#if defined(CRAY) -#include -#define USE_FCD -#endif extern void lattice_min_difference_(); @@ -943,29 +935,13 @@ double nwpw_fmachine(Integer i0, Integer ii0, Integer ln, Integer code[], double #define nwpw_emachine_parse_ nwpw_emachine_parse #endif -void FATR nwpw_emachine_parse_ -#if defined(USE_FCD) -( const _fcd fcd_eqn_string, - Integer *n1, - Integer *nc0, - Integer code0[], - Integer *nf0, - double fconst0[]) +void FATR nwpw_emachine_parse_ (char eqn_string[], + Integer *n1, + Integer *nc0, + Integer code0[], + Integer *nf0, + double fconst0[]) { - char *eqn_string = _fcdtocp(fcd_eqn_string); - -#else -(eqn_string,n1,nc0,code0,nf0,fconst0) -char eqn_string[]; -Integer *n1; -Integer *nc0; -Integer code0[]; -Integer *nf0; -double fconst0[]; -{ - -#endif - int i; char nstr[500]; int ns = *n1; @@ -996,28 +972,13 @@ double fconst0[]; #define nwpw_emachine_f_ nwpw_emachine_f #endif -double FATR nwpw_emachine_f_ -#if defined(USE_FCD) -( - Integer *nc0, - Integer code0[], - Integer *nf0, - double fconst0[], - Integer *nion0, - double *rion0[]) +double FATR nwpw_emachine_f_ (Integer *nc0, + Integer code0[], + Integer *nf0, + double fconst0[], + Integer *nion0, + double rion0[]) { - -#else -(nc0,code0,nf0,fconst0,nion0,rion0) -Integer *nc0; -Integer code0[]; -Integer *nf0; -double fconst0[]; -Integer *nion0; -double rion0[]; -{ - -#endif double f; f = nwpw_emachine(0,code0,fconst0,*nion0,rion0); @@ -1034,36 +995,19 @@ double rion0[]; * * ********************************************************/ -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define nwpw_emachine_df_ nwpw_emachine_df #endif -double FATR nwpw_emachine_df_ -#if defined(USE_FCD) -( - Integer *i0, - Integer *ii0, - Integer *nc0, - Integer code0[], - Integer *nf0, - double fconst0[], - Integer *nion0, - double *rion0[]) +double FATR nwpw_emachine_df_ (Integer *i0, + Integer *ii0, + Integer *nc0, + Integer code0[], + Integer *nf0, + double fconst0[], + Integer *nion0, + double rion0[]) { - -#else -(i0,ii0,nc0,code0,nf0,fconst0,nion0,rion0) -Integer *i0; -Integer *ii0; -Integer *nc0; -Integer code0[]; -Integer *nf0; -double fconst0[]; -Integer *nion0; -double rion0[]; -{ - -#endif double df; df = nwpw_fmachine(*i0,*ii0,0,code0,fconst0,*nion0,rion0); diff --git a/src/nwpw/nwpwlib/utilities/nwpw_talker.c b/src/nwpw/nwpwlib/utilities/nwpw_talker.c index c73cbf6c92..d57c698e92 100644 --- a/src/nwpw/nwpwlib/utilities/nwpw_talker.c +++ b/src/nwpw/nwpwlib/utilities/nwpw_talker.c @@ -1,7 +1,3 @@ -/* - $Id$ -*/ - #include #include #include @@ -19,39 +15,19 @@ #include "typesf2c.h" - -#if defined(CRAY) -#include -#define USE_FCD -#endif - -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define nwpw_talker_ nwpw_talker #define nwpw_talker_close_ nwpw_talker_close #define nwpw_talker_write_ nwpw_talker_write #define nwpw_talker_read_ nwpw_talker_read #endif -void FATR nwpw_talker_ -#if defined(USE_FCD) -( const _fcd fcd_addr_name, - Integer *inet, - Integer *n1, - Integer *portin, - Integer *sockout) +void FATR nwpw_talker_ (char addr_name[], + Integer *inet, + Integer *n1, + Integer *portin, + Integer *sockout) { - char *addr_name = _fcdtocp(fcd_addr_name); - -#else -(addr_name,inet,n1,portin,sockout) -char addr_name[]; -Integer *inet; -Integer *n1; -Integer *portin; -Integer *sockout; -{ - -#endif #if defined(__MINGW32__) perror("nwpw_talker: not coded for this architecture"); @@ -118,15 +94,8 @@ Integer *sockout; -void FATR nwpw_talker_close_ -#if defined(USE_FCD) -(Integer *socket1) +void FATR nwpw_talker_close_ ( Integer *socket1 ) { -#else -(socket1) -Integer *socket1; -{ -#endif #if defined(__MINGW32__) perror("nwpw_talker: not coded for this architecture"); exit(1); @@ -137,20 +106,10 @@ Integer *socket1; } -void FATR nwpw_talker_write_ -#if defined(USE_FCD) -(Integer *socket1, - const _fcd fcd_buffer, - Integer *n1) +void FATR nwpw_talker_write_ ( Integer *socket1, + char buffer[], + Integer *n1) { - char *buffer = _fcdtocp(fcd_buffer); -#else -(socket1,buffer,n1) -Integer *socket1; -char buffer[]; -Integer *n1; -{ -#endif #if defined(__MINGW32__) perror("nwpw_talker_write: not coded for this architecture"); exit(1); @@ -174,20 +133,10 @@ Integer *n1; -void FATR nwpw_talker_read_ -#if defined(USE_FCD) -(Integer *socket1, - const _fcd fcd_buffer, - Integer *n1) -{ - char *buffer = _fcdtocp(fcd_buffer); -#else -(socket1,buffer,n1) -Integer *socket1; -char buffer[]; -Integer *n1; +void FATR nwpw_talker_read_ ( Integer *socket1, + char buffer[], + Integer *n1 ) { -#endif #if defined(__MINGW32__) perror("nwpw_talker_read: not coded for this architecture"); exit(1);