Commit aee6c9dcf584197fb6b80989e416424043a6c167

Authored by dumoda01
1 parent 13953473
Exists in master and in 1 other branch snow

Le code a ete modifie pour permettre au modele biologique de Fasham d'utiliser l…

…es memes valeurs d'extinction que celle utilisees dans la partie physique, notamment par le module temperature. Le parametre 'A' du module physique a ete remplace par 'aa' pour etre consistant avec le module biologique. Ce changement permet notamment de fournir les valeurs de A, g1 et g2 via un fichier et que ces valeurs soient egalement prise en compte par le module bio. Il reste a appliquer ces changements aux autres modeles biologiques.
src/extras/bio/bio_fasham.F90
... ... @@ -39,6 +39,7 @@
39 39 ! default: all is private.
40 40 use bio_var
41 41 use output
  42 + use observations, only : aa,g2
42 43 private
43 44 !
44 45 ! !PUBLIC MEMBER FUNCTIONS:
... ... @@ -144,8 +145,8 @@
144 145 REALTYPE :: mu4 = 0.02
145 146 REALTYPE :: w_d = -2.0
146 147 REALTYPE, public :: kc = 0.03
147   - REALTYPE :: aa = 0.70
148   - REALTYPE :: g2 = 14.0
  148 +! REALTYPE :: aa = 0.70
  149 +! REALTYPE :: g2 = 14.0
149 150 integer :: out_unit
150 151 integer, parameter :: p=1,z=2,b=3,d=4,n=5,a=6,l=7
151 152 !EOP
... ... @@ -183,7 +184,7 @@
183 184 p_initial,z_initial,b_initial,d_initial,n_initial, &
184 185 a_initial,l_initial,p0,z0,b0,vp,alpha,k1,k2,mu1,k5,&
185 186 gamma,w_p,gmax,k3,beta,mu2,k6,delta,epsi,r1,r2,r3, &
186   - vb,k4,mu3,eta,mu4,w_d,kc,aa,g2, &
  187 + vb,k4,mu3,eta,mu4,w_d,kc, &
187 188 I_opt,inib, & !CHG1
188 189 theta,w_pmax,w_pmin !CHG2
189 190 !EOP
... ... @@ -220,8 +221,8 @@
220 221 write(10,901) w_pmin
221 222 write(*,900) ' w_pmax = ',w_pmax
222 223 write(10,901) w_pmax
223   - write(*,900) ' aa = ',aa
224   - write(10,901) aa
  224 + write(*,900) ' A = ',A
  225 + write(10,901) A
225 226 write(*,900) ' g2 = ',g2
226 227 write(10,901) g2
227 228  
... ...
src/meanflow/temperature.F90
... ... @@ -72,7 +72,7 @@
72 72 use observations, only: dtdx,dtdy,t_adv
73 73 use observations, only: w_adv_discr,w_adv_method
74 74 use observations, only: tprof,TRelaxTau
75   - use observations, only: A,g1,g2
  75 + use observations, only: aa,g1,g2
76 76 use util, only: Dirichlet,Neumann
77 77 use util, only: oneSided,zeroDivergence
78 78  
... ... @@ -200,7 +200,7 @@
200 200 z=z+h(i+1)
201 201  
202 202 ! compute short wave radiation
203   - rad(i)=I_0*(A*exp(-z/g1)+(1.-A)*exp(-z/g2)*bioshade(i+1))
  203 + rad(i)=I_0*(aa*exp(-z/g1)+(1.-aa)*exp(-z/g2)*bioshade(i+1))
204 204  
205 205 ! compute total diffusivity
206 206 avh(i)=nuh(i)+avmolT
... ...
src/observations/observations.F90
... ... @@ -86,7 +86,7 @@
86 86 REALTYPE, public :: w_adv=0.,w_height
87 87  
88 88 ! Parameters for water classification - default Jerlov type I
89   - REALTYPE, public :: A=0.58,g1=0.35,g2=23.0
  89 + REALTYPE, public :: aa=0.58,g1=0.35,g2=23.0
90 90  
91 91 !------------------------------------------------------------------------------
92 92 !
... ... @@ -755,21 +755,21 @@
755 755 LEVEL3 trim(extinct_file)
756 756 call read_extinction(extinct_unit,julday,secs)
757 757 case (1)
758   - A=0.58;g1=0.35;g2=23.0
  758 + aa=0.58;g1=0.35;g2=23.0
759 759 case (2)
760   - A=0.68;g1=1.20;g2=28.0
  760 + aa=0.68;g1=1.20;g2=28.0
761 761 case (3)
762   - A=0.62;g1=0.60;g2=20.0
  762 + aa=0.62;g1=0.60;g2=20.0
763 763 case (4)
764   - A=0.67;g1=1.00;g2=17.0
  764 + aa=0.67;g1=1.00;g2=17.0
765 765 case (5)
766   - A=0.77;g1=1.50;g2=14.0
  766 + aa=0.77;g1=1.50;g2=14.0
767 767 case (6)
768   - A=0.78;g1=1.40;g2=7.9
  768 + aa=0.78;g1=1.40;g2=7.9
769 769 case (7)
770   - A=0.7;g1=0.40;g2=8.0 ! Adolf Stips - Lago Maggiore
  770 + aa=0.7;g1=0.40;g2=8.0 ! Adolf Stips - Lago Maggiore
771 771 case (8)
772   - A=0.7;g1=3.5;g2=14.0 ! Dany Dumont - Amundsen Gulf
  772 + aa=0.7;g1=3.5;g2=14.0 ! Dany Dumont - Amundsen Gulf
773 773 case default
774 774 end select
775 775  
... ...
src/observations/read_extinction.F90
... ... @@ -15,7 +15,7 @@
15 15 ! !USES:
16 16 use time
17 17 use observations, only : read_obs
18   - use observations, only : A,g1,g2
  18 + use observations, only : aa,g1,g2
19 19 IMPLICIT NONE
20 20 !
21 21 ! !INPUT PARAMETERS:
... ... @@ -77,7 +77,7 @@
77 77  
78 78 obs = obs1 + t*alpha
79 79  
80   - A = obs(1)
  80 + aa = obs(1)
81 81 g1 = obs(2)
82 82 g2 = obs(3)
83 83  
... ...