diff --git a/.gitignore b/.gitignore index 5ece481..3f4ef09 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,10 @@ *.tws +*.mod +*.f +*.for +*.f90 +*.obj +*.o +*~ norm_end swaninit \ No newline at end of file diff --git a/INSTALL.README b/INSTALL.README index bc6de7a..79b9bfa 100644 --- a/INSTALL.README +++ b/INSTALL.README @@ -8,5 +8,11 @@ Instructions for quick installation of SWAN called ActivePerl (www.activestate.com/activeperl/downloads). The Perl version should be at least 5.0.0 or higher! -2) From the 'build' directory, type 'mk.pl ser' for a serial compilation. - Type 'mk.pl omp' for an openMP compilation +2) From the 'src' directory, type 'perl platform.pl' to set up macros.ini file + On Linux: + Type 'make ser' for serial compilation. + Type 'make omp' for an openMP compilation + On Windows: + Enter the VS compiler environment + Type 'nmake ser' for serial compilation. + Type 'nmake omp' for an openMP compilation diff --git a/bin/snl-swan-win-omp-ifort.exe b/bin/snl-swan-win-omp-ifort-32.exe similarity index 100% rename from bin/snl-swan-win-omp-ifort.exe rename to bin/snl-swan-win-omp-ifort-32.exe diff --git a/bin/snl-swan-win-omp-ifort-64.exe b/bin/snl-swan-win-omp-ifort-64.exe new file mode 100755 index 0000000..d9bfdef Binary files /dev/null and b/bin/snl-swan-win-omp-ifort-64.exe differ diff --git a/bin/snl-swan-win-ser-ifort.exe b/bin/snl-swan-win-ser-ifort-32.exe similarity index 100% rename from bin/snl-swan-win-ser-ifort.exe rename to bin/snl-swan-win-ser-ifort-32.exe diff --git a/bin/snl-swan-win-ser-ifort-64.exe b/bin/snl-swan-win-ser-ifort-64.exe new file mode 100755 index 0000000..df487d5 Binary files /dev/null and b/bin/snl-swan-win-ser-ifort-64.exe differ diff --git a/src/platform.pl b/src/platform.pl index ece03cd..2efb143 100644 --- a/src/platform.pl +++ b/src/platform.pl @@ -1,8 +1,8 @@ -my $os = `uname -s`; +#my $os = `uname -s`; $os = $^O unless chomp($os); -my $cpu = `uname -m`; - $cpu = $^O unless chomp($cpu); +#my $cpu = `uname -m`; +# $cpu = $^O unless chomp($cpu); open(OUTFILE,">macros.inc");