Commit f5cf019f authored by Gwenaelle Gremion's avatar Gwenaelle Gremion

Beaucoup de developpement du modele

parent b15ffe85
......@@ -867,7 +867,6 @@
if (allocated(ammlim2)) deallocate(ammlim2)
if (allocated(ppnet)) deallocate(ppnet)
if (allocated(flux_msn)) deallocate(flux_msn)
if (allocated(Flux_P)) deallocate(Flux_P)
if (allocated(Flux_D1)) deallocate(Flux_D1)
......@@ -981,6 +980,8 @@
if (rc /= 0) STOP 'init_bio: Error allocating (sti_dzofp)'
allocate(sti_2fp(0:nlev),stat=rc)
if (rc /= 0) STOP 'init_bio: Error allocating (sti_2fp)'
!DD
allocate(lumlim1(0:nlev),stat=rc)
......
This diff is collapsed.
......@@ -42,6 +42,7 @@
REALTYPE, dimension(:), allocatable :: w_msn_lev
integer :: w_msn_lev_id
REALTYPE :: dt_eff
REALTYPE, dimension(:,:), allocatable :: cc,ws
integer :: surface_flux_method=-1
......
......@@ -85,6 +85,10 @@
! relaxation times for hydrocarbon
REALTYPE, public, dimension(:), allocatable :: HCRelaxTau
!TEST
! relaxation times for phy
REALTYPE, public, dimension(:), allocatable :: phyRelaxTau
! sea surface elevation, sea surface gradients and height of velocity obs.
REALTYPE, public :: zeta=0.,dpdx=0.,dpdy=0.,h_press=0
......@@ -259,6 +263,8 @@
integer, parameter :: n_prof_unit=41 !CHG3
integer, parameter :: a_prof_unit=42 !CHG5
integer, parameter :: hc_prof_unit=43
!!!!!TEST
!integer, parameter :: phy_prof_unit=44
! pre-defined parameters
integer, parameter :: READ_SUCCESS=1
......@@ -448,6 +454,9 @@
read(namlst,nml=aprofile,err=94)
read(namlst,nml=tprofile,err=82)
read(namlst,nml=hcprofile,err=95)
!TEST
! read(namlst,nml=phyprofile,err=95)
read(namlst,nml=ext_pressure,err=83)
read(namlst,nml=int_pressure,err=84)
read(namlst,nml=extinct,err=85)
......@@ -559,12 +568,16 @@
NRelaxTau(0)=NRelaxTauB !CHG3
ARelaxTau(0)=ARelaxTauB !CHG3
HCRelaxTau(0)=HCRelaxTauB
!phyRelaxTau(0)=phyRelaxTauB ! TEST
do i=1,nlev
TRelaxTau(i)=TRelaxTauM
SRelaxTau(i)=SRelaxTauM
NRelaxTau(i)=NRelaxTauM !CHG3
ARelaxTau(i)=ARelaxTauM !CHG3
HCRelaxTau(i)=HCRelaxTauM
! phyRelaxTau(i)=phyRelaxTauM ! TEST
db=db+0.5*h(i)
ds=ds-0.5*h(i)
if (db.le.SRelaxBott) SRelaxTau(i)=SRelaxTauB
......@@ -577,6 +590,10 @@
if (ds.le.ARelaxSurf) ARelaxTau(i)=ARelaxTauS !CHG5
if (db.le.HCRelaxBott) HCRelaxTau(i)=HCRelaxTauB
if (ds.le.HCRelaxSurf) HCRelaxTau(i)=HCRelaxTauS
!TEST
! if (db.le.phyRelaxBott) phyRelaxTau(i)=phyRelaxTauB
! if (ds.le.phyRelaxSurf) phyRelaxTau(i)=phyRelaxTauS
db=db+0.5*h(i)
ds=ds-0.5*h(i)
if ((s_prof_method.ne.0).and.(SRelaxTau(i).le.0.)) then
......@@ -624,6 +641,7 @@
LEVEL2 '***************************************************'
stop 'init_observations'
end if
end do
allocate(o2_prof(0:nlev),stat=rc)
......@@ -1269,7 +1287,7 @@
close(t_prof_unit)
close(n_prof_unit) !CHG3
close(a_prof_unit) !CHG5
close(hc_prof_unit) !CHG5
close(hc_prof_unit)
close(ext_press_unit)
close(int_press_unit)
close(extinct_unit)
......
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