--- trunk/libf/dyn3d/dynredem0.f90 2012/09/20 13:00:41 66 +++ trunk/dyn3d/dynredem0.f 2014/03/26 18:16:05 92 @@ -10,20 +10,21 @@ ! Ecriture du fichier de redémarrage au format NetCDF (initialisation) USE comconst, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad - USE disvert_m, ONLY: ap, bp, nivsig, nivsigs, pa, preff, presnivs USE comgeom, ONLY: aire_2d, cu_2d, cv_2d, rlatu, rlatv, rlonu, rlonv + use conf_gcm_m, ONLY: fxyhypb, ysinus USE dimens_m, ONLY: iim, jjm, llm, nqmx + USE disvert_m, ONLY: ap, bp, pa, preff, presnivs USE ener, ONLY: ang0, etot0, ptot0, stot0, ztot0 - USE calendar, ONLY: ju2ymds, ymds2ju USE iniadvtrac_m, ONLY: tname, ttext - use conf_gcm_m, ONLY: fxyhypb, ysinus + USE ju2ymds_m, ONLY: ju2ymds + USE netcdf, ONLY: nf90_clobber, nf90_float, nf90_global, nf90_unlimited USE netcdf95, ONLY: nf95_close, nf95_create, nf95_def_dim, nf95_def_var, & nf95_enddef, nf95_inq_varid, nf95_put_att, nf95_put_var - USE netcdf, ONLY: nf90_clobber, nf90_float, nf90_global, nf90_unlimited USE paramet_m, ONLY: iip1, jjp1, llmp1 USE serre, ONLY: clat, clon, dzoomx, dzoomy, grossismx, grossismy, taux, & tauy USE temps, ONLY: annee_ref, day_ref + use ymds2ju_m, only: ymds2ju CHARACTER(len=*), INTENT(IN):: fichnom INTEGER, INTENT(IN):: iday_end @@ -135,13 +136,6 @@ CALL nf95_def_var(ncid, 'rlatv', nf90_float, idim_rlatv, varid) CALL nf95_put_att(ncid, varid, 'title', 'Latitudes des points V') - CALL nf95_def_var(ncid, 'nivsigs', nf90_float, idim_s, varid) - CALL nf95_put_att(ncid, varid, 'title', 'Numero naturel des couches s') - - CALL nf95_def_var(ncid, 'nivsig', nf90_float, idim_sig, varid) - CALL nf95_put_att(ncid, varid, 'title', & - 'Numero naturel des couches sigma') - CALL nf95_def_var(ncid, 'ap', nf90_float, idim_sig, varid) CALL nf95_put_att(ncid, varid, 'title', 'Coefficient A pour hybride') @@ -221,12 +215,6 @@ CALL nf95_inq_varid(ncid, 'rlatv', varid) CALL nf95_put_var(ncid, varid, rlatv) - CALL nf95_inq_varid(ncid, 'nivsigs', varid) - CALL nf95_put_var(ncid, varid, nivsigs) - - CALL nf95_inq_varid(ncid, 'nivsig', varid) - CALL nf95_put_var(ncid, varid, nivsig) - CALL nf95_inq_varid(ncid, 'ap', varid) CALL nf95_put_var(ncid, varid, ap)