Commit f21461ba31677f557b2e422605046a87b6d256da

Authored by Philippe Klotz
2 parents 63c62f83 73eb32bd
Exists in master and in 1 other branch snow

Merge branch 'master' of https://gitlasso.uqar.ca/dumoda01/gotm_ismer

src/extras/bio/bio_fasham.F90
1   -!$Id: bio_fasham.F90,v 1.11 2007-01-06 11:49:15 kbk Exp $
  1 +!$id: bio_fasham.F90,v 1.11 2007-01-06 11:49:15 kbk Exp $
2 2 #include"cppdefs.h"
3 3 !-----------------------------------------------------------------------
4 4 !BOP
... ... @@ -214,12 +214,8 @@
214 214 write(10,901) k2
215 215 write(*,900) ' w_p = ',w_p
216 216 write(10,901) w_p
217   - write(*,900) ' theta = ',theta
218   - write(10,901) theta
219   - write(*,900) ' w_pmin = ',w_pmin
220   - write(10,901) w_pmin
221   - write(*,900) ' w_pmax = ',w_pmax
222   - write(10,901) w_pmax
  217 + write(*,900) ' gmax = ',gmax
  218 + write(10,901) gmax
223 219  
224 220 900 format (a,f8.5)
225 221 901 format (f8.5)
... ...
src/extras/bio/bio_gsj.F90
... ... @@ -234,7 +234,6 @@
234 234 endif
235 235  
236 236  
237   -900 format (a,f8.5)
238 237 901 format (f8.5)
239 238  
240 239 ! Conversion from day to second
... ... @@ -625,12 +624,12 @@
625 624 fac4 = hmratio**0.25
626 625  
627 626 ! Autotroph metabolic rate
628   - amr1 = max(0.0,ca1*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
629   - amr2 = max(0.0,ca2*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac3)
  627 + amr1 = max(0d0,ca1*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
  628 + amr2 = max(0d0,ca2*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac3)
630 629  
631 630 ! Heterotroph metabolic rate
632   - hmr1 = max(0.0,ch1*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
633   - hmr2 = max(0.0,ch2*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac4)
  631 + hmr1 = max(0d0,ch1*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
  632 + hmr2 = max(0d0,ch2*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac4)
634 633 else
635 634 amr1 = 1.0
636 635 amr2 = 1.0
... ...
src/extras/bio/bio_ismer.F90
... ... @@ -228,7 +228,6 @@
228 228 endif
229 229  
230 230  
231   -900 format (a,f8.5)
232 231 901 format (f8.5)
233 232  
234 233 ! Conversion from day to second
... ... @@ -603,12 +602,12 @@
603 602 fac4 = hmratio**0.25
604 603  
605 604 ! Autotroph metabolic rate
606   - amr1 = max(0.0,ca1*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
607   - amr2 = max(0.0,ca2*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac3)
  605 + amr1 = max(0d0,ca1*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
  606 + amr2 = max(0d0,ca2*0.25*exp(Ea/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac3)
608 607  
609 608 ! Heterotroph metabolic rate
610   - hmr1 = max(0.0,ch1*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
611   - hmr2 = max(0.0,ch2*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac4)
  609 + hmr1 = max(0d0,ch1*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0))) )
  610 + hmr2 = max(0d0,ch2*0.25*exp(Eh/(kBeV*T0**2)*(T(ci)/(1+T(ci)/T0)))/fac4)
612 611 else
613 612 amr1 = 1.0
614 613 amr2 = 1.0
... ...