Skip to content

Commit

Permalink
Merge pull request #2 from PESchoenberg/develop
Browse files Browse the repository at this point in the history
Updated info.
  • Loading branch information
PESchoenberg committed Mar 27, 2019
2 parents b77d406 + dd548a6 commit 1ff3a46
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 20 deletions.
2 changes: 1 addition & 1 deletion COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
of this license document, but changing it is not allowed.

Preamble

The GNU General Public License is a free, copyleft license for
software and other kinds of works.

Expand Down
2 changes: 1 addition & 1 deletion COPYING.LESSER
Original file line number Diff line number Diff line change
Expand Up @@ -162,5 +162,5 @@ General Public License ever published by the Free Software Foundation.
whether future versions of the GNU Lesser General Public License shall
apply, that proxy's public statement of acceptance of any version is
permanent authorization for you to choose that version for the
Library.
Library.

10 changes: 6 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,18 @@

A collection under development of Fortran modules and functions written over
time that might be useful for calculations in maths, astronomy, aeronautics,
etc. Some of these functions are still unfinished or need further testing.
etc. Some of these functions are still unfinished or need further testing; all
of them originated as "scrapbook material" from various Matlab and Frotran
projects that I kept jsut because they could be useful in the future.


## Dependencies and requirements:

* gfortran.
* gfortran compiler.

* OpenMP.
* OpenMP library.

* MPICH or OpenMPI.
* MPICH or OpenMPI libraries.


## Installation:
Expand Down
12 changes: 6 additions & 6 deletions cfmath.sh
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
#!/bin/bash
clear
echo 'Compiling fmath libraries...'
echo 'fmath3...'
echo 'Compiling fmath libraries... '
echo 'fmath3... '
gfortran -std='gnu' -c fmath3.f95 -O3 -march=native -Wall -Wextra -ffree-form
echo 'fmath4...'
echo 'fmath4... '
gfortran -std='gnu' -c fmath4.f95 -O3 -march=native -Wall -Wextra -ffree-form
echo 'fmath1...'
echo 'fmath1... '
gfortran -std='gnu' -c fmath1.f95 -O3 -march=native -Wall -Wextra -ffree-form
echo 'fmath2...'
echo 'fmath2... '
gfortran -std='gnu' -c fmath2.f95 -O3 -march=native -Wall -Wextra -ffree-form
echo 'fmath5...'
echo 'fmath5... '
gfortran -std='gnu' -c fmath5.f95 -O3 -march=native -Wall -Wextra -ffree-form
echo
echo 'Finished compiling fmath libraries.'
Expand Down
1 change: 1 addition & 0 deletions fmath1.f95
Original file line number Diff line number Diff line change
Expand Up @@ -3834,6 +3834,7 @@ subroutine RspFTestFmath1All()


!> Test for fmath1 subroutines and functions.
!>
!> - RspFTestTime(...)
!> - RspFTestMetricImperial(...)
!> - RspFTestMetricLength(...)
Expand Down
6 changes: 5 additions & 1 deletion fmath2.f95
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@ pure real( kind = fmath2_p1 ) function RspFLinearMomentum1( p_m, p_v )

real( kind = fmath2_p1 ), intent(in) :: p_m, p_v

!RspFLinearMomentum1 = p_m * p_v * RspFLorentzFactor( RspFConst("c") )
RspFLinearMomentum1 = p_m * p_v * RspFLorentzFactor( p_v )

return
Expand Down Expand Up @@ -1699,6 +1698,7 @@ subroutine RspFTestFmath2All()


!> Test for fmath2 subroutines and functions.
!>
!> - RspFAngularMomentum1(...)
!> - RspFAngularMomentum2(...)
!> - RspFLinearMomentum1(...)
Expand Down Expand Up @@ -1821,6 +1821,7 @@ subroutine RspFTestFmath21()


!> Test for fmath2 subroutines and functions.
!>
!> - RspFApproximateRocheLobeEggleton(...)
!> - RspFHillSphere(...)
!> - RspFArcsec2Km(...)
Expand Down Expand Up @@ -2071,6 +2072,7 @@ subroutine RspFTestFmath23()


!> Test for fmath2 subroutines and functions.
!>
!> - RspFIsBlackHole(...)
!> - RspFIsOverChandrasekharLimit(...)
!> - RspFKg2Em(...)
Expand Down Expand Up @@ -2213,6 +2215,7 @@ subroutine RspFTestFmath24()


!> Test for fmath2 subroutines and functions.
!>
!> - RspFMeanMotion(...)
!> - RspFPs2Ly(...)
!> - RspFRadius2SchwarzschildRatio(...)
Expand Down Expand Up @@ -2340,6 +2343,7 @@ subroutine RspFTestFmath25()


!> Test for fmath2 subroutines and functions.
!>
!> - RspFSurfaceGravity1(...)
!> - RspFSurfaceGravity2(...)
!>
Expand Down
1 change: 0 additions & 1 deletion fmath3.f95
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ module fmath3

! Setting a platform-independent floating point precision.
integer, parameter :: fmath3_p1 = selected_real_kind( 10,300 )
!integer, parameter :: fmath3_p2 = 10

!------------------------------------------------------------------------------
contains
Expand Down
2 changes: 1 addition & 1 deletion fmath4.f95
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module fmath4
! Misc functions.


!> Draws a line on console.
!> Draws a simple line in the console.
!>
subroutine RspFLine()

Expand Down
3 changes: 0 additions & 3 deletions fmath5.f95
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,6 @@
!>
!> =============================================================================
!>
!> Modified:
!> - Jul 5 2018.
!>
!> Compilation:
!> - ./cfmath.sh or
!> - mpif90 -std='gnu' -c fmath5.f95 -O3 -march=native -Wall -Wextra -fopenmp -fdec-math
Expand Down
6 changes: 4 additions & 2 deletions tfmath1.f95
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
!>
!> Test program for fmath* functions.
!>
!> Compilation nad linking:
!> Compilation and linking:
!> - gfortran -std='gnu' tfmath1.f95 fmath1.o fmath2.o fmath3.o fmath4.o fmath5.o -o tfmath1 -O3 -march=native -Wall -Wextra -fopenmp
!>
!> or (if you want to use MPICH with this)
Expand All @@ -35,7 +35,9 @@
!>
!> or (if you compiled it for use with MPICH)
!>
!> - mpiexec -np [n] ./tfmath1_mpi (n = number of processes to use, recommended n = 1 in this case).
!> - mpiexec -np [n] ./tfmath1_mpi (n = number of processes to use, recommended
!> n = 1 in this case, because you might get errors otherwise, at least it the
!> present version of fmath).
!>
program tfmath1

Expand Down

0 comments on commit 1ff3a46

Please sign in to comment.