Skip to content
GitLab
Commit aebbe11e authored by Franco Mele's avatar Franco Mele
Browse files

avrei committato già tutto

parent 0677a41b
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
View file @ aebbe11e
......@@ -5,3 +5,8 @@
*.dll
*.exe
*.a
.DS_store
cluster2000x
main_program
f77_to_f90
fixcon
MEMO.txt deleted 100644 → 0
View file @ 0677a41b
# Command line instructions
# Git global setup
git config --global user.name "Franco Mele"
git config --global user.email "franco.mele@ingv.it"
# Create a new repository
mkdir decluster
cd decluster
git init
touch README.md
git add README.md
git commit -m "first commit"
git remote add origin git@gitlab.rm.ingv.it:franco.mele/decluster.git
git push -u origin master
# Push an existing Git repository
cd existing_git_repo
git remote add origin git@gitlab.rm.ingv.it:franco.mele/decluster.git
git push -u origin master
Makefile 100755 → 100644
View file @ aebbe11e
FC = gfortran
FFLAGS = -g
cluster2000x: cluster2000x.o
$(FC) $(FFLAGS) -o cluster2000x cluster2000x.o
cluster2000x:
$(FC) $(FFLAGS) -o cluster2000x cluster2000x.f90
zero: zero.o
$(FC) $(FFLAGS) -o zero zero.o
main_program:
$(FC) $(FFLAGS) -o main_program main_program.f90
test_tdif2: test_tdif2.o
$(FC) $(FFLAGS) -o test_tdif2 test_tdif2.o
clean:
rm cluster2000x cluster2000x.o
rm main_program main_program.o
Makefile_originale 0 → 100644
View file @ aebbe11e
FC = f77
FFLAGS = -g -Nl50
cluster2000x: cluster2000x.o
$(FC) $(FFLAGS) -o cluster2000x cluster2000x.o
zero: zero.o
$(FC) $(FFLAGS) -o zero zero.o
test_tdif2: test_tdif2.o
$(FC) $(FFLAGS) -o test_tdif2 test_tdif2.o
README.md
View file @ aebbe11e
| programma | | linguaggio|
|----------|:-------------|------:|
| main_program.f90| è il programma da usare, ottenuto dall'originale <br> dell'USGS, con alcune modifiche sul formato di input, <br> con l'aggiunta di alcune opzioni sulla selezione dei terremoti da utilizzare (profondità). <br> Inoltre si selezionano anche le sequenze più importanti in base alla magnitudo equivalente e al numero di eventi.| |
| cluster2000x.f| programma originale distribuito da USGS | F77|
| cluster2000x.f90 | versione modificata in Fortran 90| F90 |
| f77\_to\_f90.f90 | trasforma un file sorgente scritto in F77 (.for o .f) <br> in un altro file sorgente in Fortran 90 (.f90) | F90 |
| | | |
ESEMPIO DI RIGA DEL FILE DI INPUT di tipo FREE FORMAT (5 interi e 4 reali separati da blank o tab):
2008 01 01 02 20 44.492 10.202 10.5 2.1
I vari campi indicano nell'ordine:
anno, mese, giorno, ore, minuti, latitudine, longitudine, profondità, magnitudo_ML.
Ricordarsi di riordinare l'uscita in data crescente (esce decrescente).
Ricordarsi anche di imporre il punto con cifre decimali anche agli interi
nelle ultime 4 colonne che prevedono reali (se si passa per un excel).
# Command line instructions
# Git global setup
git config --global user.name "Franco Mele"
git config --global user.email "franco.mele@ingv.it"
# Create a new repository
mkdir decluster
cd decluster
git init
touch README.md
git add README.md
git commit -m "first commit"
git remote add origin git@gitlab.rm.ingv.it:franco.mele/decluster.git
git push -u origin master
# Push an existing Git repository
cd existing_git_repo
git remote add origin git@gitlab.rm.ingv.it:franco.mele/decluster.git
git push -u origin master
per la compilazione
gfortran -g -o cluster2000x cluster2000x.o -L/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/lib
1.
......
cluster2000x.f 100755 → 100644
View file @ aebbe11e
......@@ -384,7 +384,7 @@ c--- test for spatial clustering
1 jtime,lat2,xlat2,lon2,xlon2,dep2,xmag2,erh2,erz2,q2,
2 cmag1(list(i)),cluster,ierradj)
if (cluster .EQV. .false.) goto 200
if (cluster .eq. .false.) goto 200
c---- cluster declared
c if event i and event j are both already associated with
......@@ -1106,4 +1106,4 @@ c--Grab the next record from the buffer
c--End of file
9 istat=1
return
end
end
\ No newline at end of file
cluster2000x.f90 0 → 100644
View file @ aebbe11e
This diff is collapsed.
f77_to_f90.f90 0 → 100644
View file @ aebbe11e
This diff is collapsed.
fixcon.f90 0 → 100644
View file @ aebbe11e
program main
!*****************************************************************************80
!
!! MAIN is the main program for FIXCON.
!
! Discussion:
!
! FIXCON gets information from a user about the FORTRAN77 file to convert.
!
! The program's task is simple but tedious. FORTRAN77 imposed a maximum
! line length of 72 characters (and also reserved the first 6 columns for
! labels and continuation marks). So a FORTRAN77 programmer, when writing
! a long statement, would have to break the statement up in a way that
! fitted within the column limitations, while signaling to the compiler
! that these several statements were really one. FORTRAN77 used a system
! of "continuation" characters in this situation. If a statement was
! continued over several lines, then a special character was put in
! column 6 of all the lines which represented continuations of the previous
! line. The continuation character could be any legal FORTRAN77 character
! EXCEPT a blank or the character '0'.
!
! Thus, a long FORTRAN77 statement, when broken up using continuation,
! might look like this:
!
! x = 1 + 2 + 3 + 4 +
! & 5 + 6 + 7 + 8 +
! & 9 + 10
!
! where we are here using "&" for the continuation character.
!
! In FORTRAN90, a long line is continued by putting an ampersand (this is
! the ONLY continuation character FORTRAN90 allows) at the END of each
! line for which there is more coming. So the same long statement
! in FORTRAN90 might look like
!
! x = 1 + 2 + 3 + 4 + &
! 5 + 6 + 7 + 8 + &
! 9 + 10
!
! This program reads in a file that uses the FORTRAN77 continuation scheme,
! and writes out a copy that uses the FORTRAN90 continuation scheme.
!
! FORTRAN77 ignored all data beyond column 72, and so people naturally
! put stuff there (to number the lines, for instance). This program
! will try to simulate this fact by truncating the input line at column 72.
! (Of course, doing this raises issues about the meaning and treatment
! of TAB characters but I'm not the one who sold my soul to the
! TAB devil!)
!
! FORTRAN77 comment lines (which begin variously with 'C', 'c',
! 'D', 'd', '*' and '!') are rewritten with an initial '!', the
! FORTRAN90 comment initiator.
!
! It is the author's belief that TAB characters are a blight. Having
! been bitten numerous times by TAB characters while using FIXCON,
! the program has been altered to carry out the following procedure
! in the presence of TAB characters:
!
! * Upon detection of the first TAB character, a warning message is
! issued.
!
! * Every TAB character is replaced by 6 blanks, whether this was the
! user's intention or not.
!
! * Continuation replacement proceeds thereafter.
!
! Usage:
!
! fixcon file.f77 file.f90
!
! or
!
! fixcon file.f77
!
! in which case the output file will automatically be called
! "file.f90"
!
! Licensing:
!
! This code is distributed under the GNU LGPL license.
!
! Modified:
!
! 06 January 2005
!
! Author:
!
! John Burkardt
!
implicit none
integer ( kind = 4 ) iarg
integer ( kind = 4 ) iargc
! integer ( kind = 4 ) ierror
! integer ( kind = 4 ) ilen
character ( len = 255 ) input_file
integer ( kind = 4 ), parameter :: input_unit = 1
integer ( kind = 4 ) ios
! integer ( kind = 4 ) ipxfargc
integer ( kind = 4 ) num_arg
character ( len = 255 ) output_file
integer ( kind = 4 ), parameter :: output_unit = 2
call timestamp ( )
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON'
write ( *, '(a)' ) ' FORTRAN90 version'
write ( *, '(a)' ) ' Read a file with FORTRAN77 style continuation lines;'
write ( *, '(a)' ) ' Write the information with FORTRAN90 continuation.'
!
! Get the number of command line arguments.
!
! Old style:
!
num_arg = iargc ( )
!
! New style:
!
! num_arg = ipxfargc ( )
!
! If at least one command line argument, it's the input file name.
!
if ( num_arg < 1 ) then
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'Enter the input file name:'
read ( *, '(a)', iostat = ios ) input_file
if ( ios /= 0 ) then
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON - Fatal error!'
write ( *, '(a)' ) ' Unexpected read error!'
stop
end if
else
iarg = 1
!
! Old style:
!
call getarg ( iarg, input_file )
!
! New style:
!
! call pxfgetarg ( iarg, input_file, ilen, ierror )
!
! if ( ierror /= 0 ) then
! write ( *, '(a)' ) ' '
! write ( *, '(a)' ) 'FIXCON - Fatal error!'
! write ( *, '(a)' ) ' Could not read command line argument.'
! stop
! end if
end if
!
! If two command line arguments, the second one is the output file name.
!
if ( num_arg < 2 ) then
output_file = input_file
call file_name_ext_swap ( output_file, 'f90' )
else
iarg = 2
!
! Old style:
!
call getarg ( iarg, output_file )
!
! New style:
!
! call pxfgetarg ( iarg, output_file, ilen, ierror )
!
! if ( ierror /= 0 ) then
! write ( *, '(a)' ) ' '
! write ( *, '(a)' ) 'FIXCON - Fatal error!'
! write ( *, '(a)' ) ' Could not read command line argument.'
! stop
! end if
end if
!
! Now we know what to do.
!
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON'
write ( *, '(a)' ) ' Read F77 file: "' // trim ( input_file ) // '".'
write ( *, '(a)' ) ' Write F90 file: "' // trim ( output_file ) // '".'
open ( unit = input_unit, file = input_file, status = 'old', &
iostat = ios )
if ( ios /= 0 ) then
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON - Fatal error!'
write ( *, '(a)' ) ' There was an error while trying to open the'
write ( *, '(a)' ) ' input file "' // trim ( input_file ) // '".'
stop
end if
open ( unit = output_unit, file = output_file, status = 'replace' )
call fix_continuation ( input_unit, output_unit )
close ( unit = input_unit )
close ( unit = output_unit )
!
! Terminate.
!
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON'
write ( *, '(a)' ) ' Normal end of execution.'
write ( *, '(a)' ) ' '
call timestamp ( )
stop 0
end
subroutine file_name_ext_swap ( file_name, ext )
!*****************************************************************************80
!
!! FILE_NAME_EXT_SWAP replaces the current "extension" of a file name.
!
! Discussion:
!
! The "extension" of a filename is the string of characters
! that appears after the LAST period in the name. A file
! with no period, or with a period as the last character
! in the name, has a "null" extension.
!
! Example:
!
! Input Output
! ================ =========
! FILE_NAME EXT FILE_NAME
!
! bob.for obj bob.obj
! bob.bob.bob txt bob.bob.txt
! bob yak bob.yak
!
! Licensing:
!
! This code is distributed under the GNU LGPL license.
!
! Modified:
!
! 09 August 1999
!
! Author:
!
! John Burkardt
!
! Parameters:
!
! Input/output, character ( len = * ) FILE_NAME, a file name.
! On output, the extension of the file has been changed.
!
! Input, character ( len = * ) EXT, the extension to be used on the output
! copy of FILE_NAME, replacing the current extension if any.
!
implicit none
character ( len = * ) ext
character ( len = * ) file_name
integer ( kind = 4 ) i
integer ( kind = 4 ) j
integer ( kind = 4 ) len_max
integer ( kind = 4 ) len_name
len_max = len ( file_name )
len_name = len_trim ( file_name )
call file_name_ext_get ( file_name, i, j )
if ( i == 0 ) then
if ( len_name + 1 > len_max ) then
return
end if
len_name = len_name + 1
file_name(len_name:len_name) = '.'
i = len_name + 1
else
i = i + 1
file_name(i:j) = ' '
end if
file_name(i:) = ext
return
end
subroutine file_name_ext_get ( file_name, i, j )
!*****************************************************************************80
!
!! FILE_NAME_EXT_GET determines the "extension" of a file name.
!
! Discussion:
!
! The "extension" of a filename is the string of characters
! that appears after the LAST period in the name. A file
! with no period, or with a period as the last character
! in the name, has a "null" extension.
!
! Blanks are unusual in filenames. This routine ignores all
! trailing blanks, but will treat initial or internal blanks
! as regular characters acceptable in a file name.
!
! Example:
!
! FILE_NAME I J
!
! bob.for 4 7
! N.B.C.D 6 7
! Naomi. 6 6
! Arthur 0 0
! .com 1 1
!
! Licensing:
!
! This code is distributed under the GNU LGPL license.
!
! Modified:
!
! 17 July 1998
!
! Author:
!
! John Burkardt
!
! Parameters:
!
! Input, character ( len = * ) FILE_NAME, a file name to be examined.
!
! Output, integer ( kind = 4 ) I, J, the indices of the first and
! last characters in the file extension.
!
! If no period occurs in FILE_NAME, then
! I = J = 0;
! Otherwise,
! I is the position of the LAST period in FILE_NAME, and J is the
! position of the last nonblank character following the period.
!
implicit none
character ( len = * ) file_name
integer ( kind = 4 ) i
integer ( kind = 4 ) j
integer ( kind = 4 ) s_index_last
i = s_index_last ( file_name, '.' )
if ( i /= 0 ) then
j = len_trim ( file_name )
else
j = 0
end if
return
end
subroutine fix_continuation ( input, output )
!*****************************************************************************80
!
!! FIX_CONTINUATION copies a FORTRAN77 file, using FORTRAN90 continuation.
!
! Licensing:
!
! This code is distributed under the GNU LGPL license.
!
! Modified:
!
! 15 June 2002
!
! Author:
!
! John Burkardt
!
! Parameters:
!
! Input, integer ( kind = 4 ) INPUT, OUTPUT, the I/O units associated
! with the input (F77) and output (F90) files respectively.
!
implicit none
logical, save :: found_tab = .false.
logical have_line
integer ( kind = 4 ) input
integer ( kind = 4 ) ios
character ( len = 255 ) new_line
character ( len = 255 ) old_line
integer ( kind = 4 ) output
character, parameter :: TAB = char ( 9 )
have_line = .false.
old_line = ' '
do
!
! Read the next line.
!
read ( input, '(a)', iostat = ios ) new_line
if ( ios /= 0 ) then
exit
end if
!
! If the line contains any TAB characters, then
!
if ( index ( new_line, TAB ) /= 0 ) then
if ( .not. found_tab ) then
found_tab = .true.
write ( *, '(a)' ) ' '
write ( *, '(a)' ) 'FIXCON - Warning!'
write ( *, '(a)' ) ' This file contains TAB characters.'
write ( *, '(a)' ) ' They will be replaced by 6 blanks.'
write ( *, '(a)' ) ' The results may not be what you want.'
end if
call s_tab_blanks ( new_line )
end if
!
! If it's an F77 comment line, write it out immediately...
! ...but change to F90 format.
!
if ( &
new_line(1:1) == '!' .or. &
new_line(1:1) == '*' .or. &
new_line(1:1) == 'c' .or. &
new_line(1:1) == 'C' .or. &
new_line(1:1) == 'd' .or. &
new_line(1:1) == 'D' ) then
if ( have_line ) then
write ( output, '(a)' ) trim ( old_line )
have_line = .false.
end if
new_line(1:1) = '!'
write ( output, '(a)' ) trim ( new_line )
cycle
end if
!
! Now is the time to truncate the input line to 72 columns.
!
new_line = new_line(1:72)
!
! If there's no line in storage, cycle.
!
if ( .not. have_line ) then
have_line = .true.
old_line = new_line
cycle
end if
!
! If the new line is a continuation of the old line, then...
!
if ( new_line(6:6) /= ' ' ) then
call s_cat ( old_line, ' &', old_line )
new_line(6:6) = ' '
end if
write ( output, '(a)' ) trim ( old_line )
old_line = new_line
end do
!
! When we jump out of the loop, we may have had one last line unwritten.
!
if ( have_line ) then
write ( output, '(a)' ) trim ( old_line )
end if
return