Ajout de la glace dans le fichier de sortie. La concentration de glace est...

Ajout de la glace dans le fichier de sortie. La concentration de glace est specifiee par l'utilisateur (airsea.nml) et ne sert qu'a attenuer la lumiere.

src/output/ncdfout.F90

@@ -114,7 +114,7 @@
 !  variable ids
    integer, private          :: lon_id,lat_id,z_id,z1_id,time_id
    integer, private          :: zeta_id
-   integer, private          :: sst_id,sss_id
+   integer, private          :: sst_id,sss_id,ice_id
    integer, private          :: x_taus_id,y_taus_id
    integer, private          :: swr_id,heat_id,total_id,p_e_id
    integer, private          :: int_swr_id,int_heat_id,int_total_id
@@ -233,6 +233,8 @@
    call check_err(iret)
    iret = nf_def_var(ncid,'sss',NF_REAL,3,dims, sss_id)
    call check_err(iret)
+   iret = nf_def_var(ncid,'ice',NF_REAL,3,dims, ice_id)
+   call check_err(iret)
 !BUG1   iret = nf_def_var(ncid,'x-taus',NF_REAL,3,dims, x_taus_id)
 !BUG1   call check_err(iret)
 !BUG1   iret = nf_def_var(ncid,'y-taus',NF_REAL,3,dims, y_taus_id)
@@ -410,6 +412,7 @@
    iret = set_attributes(ncid,zeta_id,units='m',long_name='sea surface elevation')
    iret = set_attributes(ncid,sst_id,units='celsius',long_name='sea surface temperature')
    iret = set_attributes(ncid,sss_id,units='psu',long_name='sea surface salinity')
+   iret = set_attributes(ncid,ice_id,units='%',long_name='ice concentration')
    iret = set_attributes(ncid,x_taus_id,units='Pa',long_name='x-wind stress')
    iret = set_attributes(ncid,y_taus_id,units='Pa',long_name='y-wind stress')
    iret = set_attributes(ncid,swr_id,units='W/m2',long_name='short wave radiation')
@@ -521,11 +524,11 @@
 !  Write the GOTM core variables to the NetCDF file.
 !
 ! !USES:
-   use airsea,       only: tx,ty,I_0,heat,p_e,sst,sss
+   use airsea,       only: tx,ty,I_0,heat,p_e,sst,sss,ice
    use airsea,       only: int_swr,int_heat,int_total
    use meanflow,     only: depth0,u_taub,u_taus,rho_0,gravity
    use meanflow,     only: h,u,v,z,S,T,buoy,SS,NN
-   use meanflow,     only: NIT,AMM                    !CHG3-5
+   use meanflow,     only: nit,amm                    !CHG3-5
    use turbulence,   only: P,B,Pb
    use turbulence,   only: num,nuh,nus
    use turbulence,   only: gamu,gamv,gamh,gams
@@ -592,6 +595,7 @@
    iret = store_data(ncid,zeta_id,XYT_SHAPE,1,scalar=zeta)
    iret = store_data(ncid,sst_id,XYT_SHAPE,1,scalar=sst)
    iret = store_data(ncid,sss_id,XYT_SHAPE,1,scalar=sss)
+   iret = store_data(ncid,ice_id,XYT_SHAPE,1,scalar=ice)
    iret = store_data(ncid,x_taus_id,XYT_SHAPE,1,scalar=rho_0*tx)
    iret = store_data(ncid,y_taus_id,XYT_SHAPE,1,scalar=rho_0*ty)
    iret = store_data(ncid,swr_id,XYT_SHAPE,1,scalar=I_0)
@@ -619,9 +623,9 @@
    iret = store_data(ncid,salt_obs_id,XYZT_SHAPE,nlev,array=sprof)
    iret = store_data(ncid,temp_id,XYZT_SHAPE,nlev,array=T)
    iret = store_data(ncid,temp_obs_id,XYZT_SHAPE,nlev,array=tprof)
-   iret = store_data(ncid,nit_id,XYZT_SHAPE,nlev,array=NIT)             !CHG3
+   iret = store_data(ncid,nit_id,XYZT_SHAPE,nlev,array=nit)             !CHG3
    iret = store_data(ncid,nit_obs_id,XYZT_SHAPE,nlev,array=nprof)       !CHG3
-   iret = store_data(ncid,amm_id,XYZT_SHAPE,nlev,array=AMM)             !CHG5
+   iret = store_data(ncid,amm_id,XYZT_SHAPE,nlev,array=amm)             !CHG5
    iret = store_data(ncid,amm_obs_id,XYZT_SHAPE,nlev,array=aprof)       !CHG5
    iret = store_data(ncid,SS_id,XYZT_SHAPE,nlev,array=SS)
    iret = store_data(ncid,NN_id,XYZT_SHAPE,nlev,array=NN)