Commit aee6c9dc authored by dumoda01's avatar dumoda01

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

Le code a ete modifie pour permettre au modele biologique de Fasham d'utiliser les 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.
parent 13953473
......@@ -39,6 +39,7 @@
! default: all is private.
use bio_var
use output
use observations, only : aa,g2
private
!
! !PUBLIC MEMBER FUNCTIONS:
......@@ -144,8 +145,8 @@
REALTYPE :: mu4 = 0.02
REALTYPE :: w_d = -2.0
REALTYPE, public :: kc = 0.03
REALTYPE :: aa = 0.70
REALTYPE :: g2 = 14.0
! REALTYPE :: aa = 0.70
! REALTYPE :: g2 = 14.0
integer :: out_unit
integer, parameter :: p=1,z=2,b=3,d=4,n=5,a=6,l=7
!EOP
......@@ -183,7 +184,7 @@
p_initial,z_initial,b_initial,d_initial,n_initial, &
a_initial,l_initial,p0,z0,b0,vp,alpha,k1,k2,mu1,k5,&
gamma,w_p,gmax,k3,beta,mu2,k6,delta,epsi,r1,r2,r3, &
vb,k4,mu3,eta,mu4,w_d,kc,aa,g2, &
vb,k4,mu3,eta,mu4,w_d,kc, &
I_opt,inib, & !CHG1
theta,w_pmax,w_pmin !CHG2
!EOP
......@@ -220,8 +221,8 @@
write(10,901) w_pmin
write(*,900) ' w_pmax = ',w_pmax
write(10,901) w_pmax
write(*,900) ' aa = ',aa
write(10,901) aa
write(*,900) ' A = ',A
write(10,901) A
write(*,900) ' g2 = ',g2
write(10,901) g2
......
......@@ -72,7 +72,7 @@
use observations, only: dtdx,dtdy,t_adv
use observations, only: w_adv_discr,w_adv_method
use observations, only: tprof,TRelaxTau
use observations, only: A,g1,g2
use observations, only: aa,g1,g2
use util, only: Dirichlet,Neumann
use util, only: oneSided,zeroDivergence
......@@ -200,7 +200,7 @@
z=z+h(i+1)
! compute short wave radiation
rad(i)=I_0*(A*exp(-z/g1)+(1.-A)*exp(-z/g2)*bioshade(i+1))
rad(i)=I_0*(aa*exp(-z/g1)+(1.-aa)*exp(-z/g2)*bioshade(i+1))
! compute total diffusivity
avh(i)=nuh(i)+avmolT
......
......@@ -86,7 +86,7 @@
REALTYPE, public :: w_adv=0.,w_height
! Parameters for water classification - default Jerlov type I
REALTYPE, public :: A=0.58,g1=0.35,g2=23.0
REALTYPE, public :: aa=0.58,g1=0.35,g2=23.0
!------------------------------------------------------------------------------
!
......@@ -755,21 +755,21 @@
LEVEL3 trim(extinct_file)
call read_extinction(extinct_unit,julday,secs)
case (1)
A=0.58;g1=0.35;g2=23.0
aa=0.58;g1=0.35;g2=23.0
case (2)
A=0.68;g1=1.20;g2=28.0
aa=0.68;g1=1.20;g2=28.0
case (3)
A=0.62;g1=0.60;g2=20.0
aa=0.62;g1=0.60;g2=20.0
case (4)
A=0.67;g1=1.00;g2=17.0
aa=0.67;g1=1.00;g2=17.0
case (5)
A=0.77;g1=1.50;g2=14.0
aa=0.77;g1=1.50;g2=14.0
case (6)
A=0.78;g1=1.40;g2=7.9
aa=0.78;g1=1.40;g2=7.9
case (7)
A=0.7;g1=0.40;g2=8.0 ! Adolf Stips - Lago Maggiore
aa=0.7;g1=0.40;g2=8.0 ! Adolf Stips - Lago Maggiore
case (8)
A=0.7;g1=3.5;g2=14.0 ! Dany Dumont - Amundsen Gulf
aa=0.7;g1=3.5;g2=14.0 ! Dany Dumont - Amundsen Gulf
case default
end select
......
......@@ -15,7 +15,7 @@
! !USES:
use time
use observations, only : read_obs
use observations, only : A,g1,g2
use observations, only : aa,g1,g2
IMPLICIT NONE
!
! !INPUT PARAMETERS:
......@@ -77,7 +77,7 @@
obs = obs1 + t*alpha
A = obs(1)
aa = obs(1)
g1 = obs(2)
g2 = obs(3)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment