commit/enzo-dev: gbryan: Breaking up too-long FORTRAN lines that resultated from the standardization of physical constants.

[commits...@bitbucket.org]

1 new commit in enzo-dev:

https://bitbucket.org/enzo/enzo-dev/commits/600199cd7551/
Changeset: 600199cd7551
Branch: week-of-code
User: gbryan
Date: 2019-03-25 22:00:42+00:00
Summary: Breaking up too-long FORTRAN lines that resultated from the standardization of physical constants.
Affected #: 12 files

diff -r 48abae241eed -r 600199cd7551 src/enzo/pop3_maker.F
--- a/src/enzo/pop3_maker.F
+++ b/src/enzo/pop3_maker.F
@@ -149,7 +149,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst*dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst*dtot)/t1
c if (tdyn .lt. cooltime(i,j,k) .and.
c & temp(i,j,k) .gt. 1.1e4)
c & write(40,*) '1',tdyn,cooltime(i,j,k),temp(i,j,k)

diff -r 48abae241eed -r 600199cd7551 src/enzo/solve_rate.F
--- a/src/enzo/solve_rate.F
+++ b/src/enzo/solve_rate.F
@@ -127,7 +127,8 @@
tbase1 = utim
xbase1 = uxyz/(aye*uaye) ! uxyz is [x]*a = [x]*[a]*a' '
dbase1 = urho*(aye*uaye)**3 ! urho is [dens]/a^3 = [dens]/([a]*a')^3 '
- coolunit = (uaye**5 * xbase1**2 * mass_h**2) / (tbase1**3 * dbase1)
+ coolunit = (uaye**5 * xbase1**2 * mass_h**2) /
+ & (tbase1**3 * dbase1)
c
c Set log values of start and end of lookup tables
c

diff -r 48abae241eed -r 600199cd7551 src/enzo/solve_rate_cool.F
--- a/src/enzo/solve_rate_cool.F
+++ b/src/enzo/solve_rate_cool.F
@@ -270,7 +270,8 @@
tbase1 = utim
xbase1 = uxyz/(aye*uaye) ! uxyz is [x]*a = [x]*[a]*a' '
dbase1 = urho*(aye*uaye)**3 ! urho is [dens]/a^3 = [dens]/([a]*a')^3 '
- coolunit = (uaye**5 * xbase1**2 * mass_h**2) / (tbase1**3 * dbase1)
+ coolunit = (uaye**5 * xbase1**2 * mass_h**2) /
+ & (tbase1**3 * dbase1)
uvel = uxyz / utim
c chunit = (7.17775e-12_RKIND)/(2._RKIND*uvel*uvel*mass_h) ! 4.5 eV per H2 formed
chunit = (ev2erg)/(2._RKIND*uvel*uvel*mass_h) ! 1 eV per H2 formed

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_feedback_pn_snia.F
--- a/src/enzo/star_feedback_pn_snia.F
+++ b/src/enzo/star_feedback_pn_snia.F
@@ -180,7 +180,8 @@
c
c EdotSNII = eSNII/0.150081 * MdotSNII*(c_light/v1)**2
if (imetalSNIa .eq. 1) then
- EdotSNIa = eSNIa/1.234e-3_RKIND * MdotSNIa*(c_light/v1)**2
+ EdotSNIa = eSNIa/1.234e-3_RKIND * MdotSNIa*
+ & (c_light/v1)**2
else
EdotSNIa = 0._RKIND
endif

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker1.F
--- a/src/enzo/star_maker1.F
+++ b/src/enzo/star_maker1.F
@@ -147,7 +147,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot) / t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4_RKIND) goto 10
@@ -160,8 +161,10 @@
c
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(d1))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND / SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(d1)))*
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass

if (bmass .lt. jeanmass) goto 10
c

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker10.F
--- a/src/enzo/star_maker10.F
+++ b/src/enzo/star_maker10.F
@@ -146,7 +146,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3.0*pi_val/32.0/GravConst/dtot)/t1
+ tdyn = sqrt(3.0*pi_val/32.0/
+ & GravConst/dtot)/t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4) goto 10
@@ -159,8 +160,10 @@
c
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6.0*sqrt(d(i,j,k)*dble(d1))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5 / SolarMass
+ jeanmass = pi_val/(6.0*
+ & sqrt(d(i,j,k)*dble(d1))) *
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5 / SolarMass

c
c THIS IS COMMENTED OUT - NO JEANS MASS CRITERION IN THIS ALGORITHM!!!
@@ -457,7 +460,7 @@
c Calculate how much of the star formation in this
c timestep would have gone into supernova energy.
c
- energy = sn_param * mform * (c_light/v1)**2 / distcells
+ energy = sn_param * mform * (c_light/v1)**2/distcells
c
c (aug 7/00 addition: share ejected energy between gas
c being ejected and that remaining in star particle)

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker2.F
--- a/src/enzo/star_maker2.F
+++ b/src/enzo/star_maker2.F
@@ -153,7 +153,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot)/t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4_RKIND) goto 10
@@ -167,9 +168,10 @@
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
if (usejeans .eq. 1) then
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(d1)))*
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND /
- & SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(d1)))*
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass

if (bmass .lt. jeanmass) goto 10
endif
@@ -462,7 +464,7 @@
c Calculate how much of the star formation in this
c timestep would have gone into supernova energy.
c
- energy = sn_param * mform * (c_light/v1)**2 / distcells
+ energy = sn_param * mform * (c_light/v1)**2/distcells
c
c (aug 7/00 addition: share ejected energy between gas
c being ejected and that remaining in star particle)

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker3.F
--- a/src/enzo/star_maker3.F
+++ b/src/enzo/star_maker3.F
@@ -154,7 +154,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot)/t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4_RKIND) goto 10
@@ -167,8 +168,10 @@
c
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(d1))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND / SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(d1))) *
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass

c
c THIS IS COMMENTED OUT - NO JEANS MASS CRITERION IN THIS ALGORITHM!!!
@@ -474,7 +477,7 @@
c Calculate how much of the star formation in this
c timestep would have gone into supernova energy.
c
- energy = sn_param * mform * (c_light/v1)**2 / distcells
+ energy = sn_param * mform * (c_light/v1)**2/distcells
c
c (aug 7/00 addition: share ejected energy between gas
c being ejected and that remaining in star particle)

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker3mom.F
--- a/src/enzo/star_maker3mom.F
+++ b/src/enzo/star_maker3mom.F
@@ -139,7 +139,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*dunits
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot)/t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4_RKIND) goto 10
@@ -152,8 +153,10 @@
c
bmass = d(i,j,k)*dble(dunits)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(dunits))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND / SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(dunits))) *
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass

c
c THIS IS COMMENTED OUT - NO JEANS MASS CRITERION IN THIS ALGORITHM!!!

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker5.F
--- a/src/enzo/star_maker5.F
+++ b/src/enzo/star_maker5.F
@@ -163,8 +163,8 @@
c coolrate is negative, gas is cooling (which is the opposite of how
c it's defined in springel & Hernquist 2003, MNRAS, 339, 289, eqn. 16
y = -1._RKIND*tstar*coolrate(i,j,k)/(d(i,j,k)*dble(d1))/
- & (beta*usn-(1._RKIND-beta)*1.5_RKIND*kboltz*temp(i,j,k)/
- & 0.6_RKIND/mass_h) !Eq(16)
+ & (beta*usn-(1._RKIND-beta)*1.5_RKIND*kboltz*
+ & temp(i,j,k)/ 0.6_RKIND/mass_h) !Eq(16)

c Calculate the fraction of mass in cold clouds
if (y .le. 0._RKIND) then

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker7.F
--- a/src/enzo/star_maker7.F
+++ b/src/enzo/star_maker7.F
@@ -191,7 +191,8 @@
c 4) t_cool < t_free-fall (if T < 1.1e4 skip this check)
c
dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot)/t1

if (tdyn .lt. cooltime(i,j,k) .and.
& temp(i,j,k) .gt. 1.1e4_RKIND) goto 10
@@ -207,8 +208,10 @@
c
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(d1))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND / SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(d1))) *
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass
c
c if (bmass .lt. jeanmass) goto 10
c

diff -r 48abae241eed -r 600199cd7551 src/enzo/star_maker_ssn.F
--- a/src/enzo/star_maker_ssn.F
+++ b/src/enzo/star_maker_ssn.F
@@ -139,11 +139,14 @@
c

dtot = ( d(i,j,k) + dm(i,j,k) )*d1
- tdyn = sqrt(3._RKIND*pi_val/32._RKIND/GravConst/dtot)/t1
+ tdyn = sqrt(3._RKIND*pi_val/32._RKIND/
+ & GravConst/dtot)/t1
bmass = d(i,j,k)*dble(d1)*dble(x1*dx)**3 / SolarMass
isosndsp2 = sndspdC * temp(i,j,k)
- jeanmass = pi_val/(6._RKIND*sqrt(d(i,j,k)*dble(d1))) *
- & dble(pi_val * isosndsp2 / GravConst)**1.5_RKIND / SolarMass
+ jeanmass = pi_val/(6._RKIND*
+ & sqrt(d(i,j,k)*dble(d1))) *
+ & dble(pi_val * isosndsp2 /
+ & GravConst)**1.5_RKIND / SolarMass

if (jeanmass > bmass) then
goto 10
@@ -423,13 +426,15 @@

num = d(i,j,k) * d1 / mu / mass_h
stromgren_radius = (
- & (3._RKIND*s49_tot(n)*1d49)/(4._RKIND*pi_val*alpha*num**2)
- & )**(1._RKIND/3._RKIND)
- stromgren_volume =
- & (4._RKIND/3._RKIND)*pi_val*stromgren_radius**3
+ & (3._RKIND*s49_tot(n)*1d49)/
+ & (4._RKIND*pi_val*alpha*num**2)
+ & )**(1._RKIND/3._RKIND)
+ stromgren_volume = (4._RKIND/3._RKIND)*
+ & pi_val*stromgren_radius**3
cell_volume = dx*x1*dx*x1*dx*x1

- ionized = kboltz*1e4 / mu / mass_h / x1**2 * t1**2
+ ionized = kboltz*1e4 / mu / mass_h /
+ & x1**2 * t1**2
if (stromgren_volume .le. cell_volume) then
ionized = ionized * stromgren_volume/cell_volume
endif

Repository URL: https://bitbucket.org/enzo/enzo-dev/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.