Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/advn.F (revision 5101) @@ -99,17 +99,17 @@ enddo -c call minmaxq(zq,qmin,qmax,'avant vlx ') - call advnqx(zq,zqg,zqd) - call advnx(zq,zqg,zqd,zm,mu,mode) - call advnqy(zq,zqs,zqn) - call advny(zq,zqs,zqn,zm,mv) - call advnqz(zq,zqh,zqb) - call advnz(zq,zqh,zqb,zm,mw) -c call vlz(zq,0.,zm,mw) - call advnqy(zq,zqs,zqn) - call advny(zq,zqs,zqn,zm,mv) - call advnqx(zq,zqg,zqd) - call advnx(zq,zqg,zqd,zm,mu,mode) -c call minmaxq(zq,qmin,qmax,'apres vlx ') +c CALL minmaxq(zq,qmin,qmax,'avant vlx ') + CALL advnqx(zq,zqg,zqd) + CALL advnx(zq,zqg,zqd,zm,mu,mode) + CALL advnqy(zq,zqs,zqn) + CALL advny(zq,zqs,zqn,zm,mv) + CALL advnqz(zq,zqh,zqb) + CALL advnz(zq,zqh,zqb,zm,mw) +c CALL vlz(zq,0.,zm,mw) + CALL advnqy(zq,zqs,zqn) + CALL advny(zq,zqs,zqn,zm,mv) + CALL advnqx(zq,zqg,zqd) + CALL advnx(zq,zqg,zqd,zm,mu,mode) +c CALL minmaxq(zq,qmin,qmax,'apres vlx ') do l=1,llm Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/conf_planete.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/conf_planete.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/conf_planete.F90 (revision 5101) @@ -81,5 +81,5 @@ ! Intrinsic heat flux (default: none) (only used if planet_type="giant") ihf = 0. -call getin('ihf',ihf) +CALL getin('ihf',ihf) END SUBROUTINE conf_planete Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/control_mod.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/control_mod.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/control_mod.F90 (revision 5101) @@ -16,10 +16,10 @@ INTEGER,SAVE :: iapp_tracvl ! apply (cumulated) traceur advection every ! iapp_tracvl dynamical steps - INTEGER,SAVE :: nsplit_phys ! number of sub-cycle steps in call to physics + INTEGER,SAVE :: nsplit_phys ! number of sub-cycle steps in CALL to physics INTEGER,SAVE :: iconser INTEGER,SAVE :: iecri INTEGER,SAVE :: dissip_period ! apply dissipation every dissip_period ! dynamical step - INTEGER,SAVE :: iphysiq ! call physics every iphysiq dynamical steps + INTEGER,SAVE :: iphysiq ! CALL physics every iphysiq dynamical steps INTEGER,SAVE :: iecrimoy INTEGER,SAVE :: dayref Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/diagedyn.F (revision 5101) @@ -52,5 +52,5 @@ c====================================================================== - USE control_mod, ONLY : planet_type + USE control_mod, ONLY: planet_type IMPLICIT NONE Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert.F90 (revision 5101) @@ -64,5 +64,5 @@ vert_sampling = merge("strato", "tropo ", ok_strato) ! default value - call getin('vert_sampling', vert_sampling) + CALL getin('vert_sampling', vert_sampling) WRITE(lunout,*) TRIM(modname)//' vert_sampling = ' // vert_sampling if (llm==39 .and. vert_sampling=="strato") then Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/disvert_noterre.F (revision 5101) @@ -181,5 +181,5 @@ DO l = 1, llm - call sig_hybrid(sig(l),pa,preff,newsig) + CALL sig_hybrid(sig(l),pa,preff,newsig) bp(l) = EXP( 1. - 1./(newsig**2) ) ap(l) = pa * (newsig - bp(l) ) Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_hyb_m.F90 (revision 5101) @@ -60,9 +60,9 @@ if (llm==1) then if (kappa/=1) then - call abort_gcm(modname, & + CALL abort_gcm(modname, & "kappa!=1 , but running in Shallow Water mode!!",42) endif if (cpp/=r) then - call abort_gcm(modname, & + CALL abort_gcm(modname, & "cpp!=r , but running in Shallow Water mode!!",42) endif Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/exner_milieu_m.F90 (revision 5101) @@ -57,9 +57,9 @@ if (llm==1) then if (kappa/=1) then - call abort_gcm(modname, & + CALL abort_gcm(modname, & "kappa!=1 , but running in Shallow Water mode!!",42) endif if (cpp/=r) then - call abort_gcm(modname, & + CALL abort_gcm(modname, & "cpp!=r , but running in Shallow Water mode!!",42) endif Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/extrapol.F (revision 5101) @@ -150,5 +150,5 @@ C C* Not enough points around point P are unmasked; interpolation on P -C will be done in a future call to extrap. +C will be done in a future CALL to extrap. C IF (inbor >= knbor) THEN Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/fxhyp_m.F90 (revision 5101) @@ -172,11 +172,11 @@ Xf(2 * nmax) = pi_d - call invert_zoom_x(xf, xtild, Xprimt, rlonm025(:iim), & + CALL invert_zoom_x(xf, xtild, Xprimt, rlonm025(:iim), & xprimm025(:iim), xuv = - 0.25_k8) - call invert_zoom_x(xf, xtild, Xprimt, rlonv(:iim), xprimv(:iim), & + CALL invert_zoom_x(xf, xtild, Xprimt, rlonv(:iim), xprimv(:iim), & xuv = 0._k8) - call invert_zoom_x(xf, xtild, Xprimt, rlonu(:iim), xprimu(:iim), & + CALL invert_zoom_x(xf, xtild, Xprimt, rlonu(:iim), xprimu(:iim), & xuv = 0.5_k8) - call invert_zoom_x(xf, xtild, Xprimt, rlonp025(:iim), & + CALL invert_zoom_x(xf, xtild, Xprimt, rlonp025(:iim), & xprimp025(:iim), xuv = 0.25_k8) end if test_grossismx @@ -211,8 +211,8 @@ END IF - call principal_cshift(is2, rlonm025, xprimm025) - call principal_cshift(is2, rlonv, xprimv) - call principal_cshift(is2, rlonu, xprimu) - call principal_cshift(is2, rlonp025, xprimp025) + CALL principal_cshift(is2, rlonm025, xprimm025) + CALL principal_cshift(is2, rlonv, xprimv) + CALL principal_cshift(is2, rlonu, xprimu) + CALL principal_cshift(is2, rlonp025, xprimp025) forall (i = 1: iim) d_rlonv(i) = rlonv(i + 1) - rlonv(i) Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/grilles_gcm_netcdf_sub.F90 (revision 5101) @@ -182,5 +182,5 @@ status=nf90_put_att(ncid_out,area_id,'long_name','gridcell area') ! land-sea mask (nearest integer approx) - status = nf90_def_var(ncid_out,'mask',NF90_INT,out_dim,mask_id) + status = nf90_def_var(ncid_out,'mask',nf90_int,out_dim,mask_id) CALL handle_err(status) status=nf90_put_att(ncid_out,mask_id,'long_name','land-sea mask (nINT approx)') Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/infotrac.F90 (revision 5101) @@ -3,6 +3,6 @@ MODULE infotrac - USE strings_mod, ONLY : msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse - USE readTracFiles_mod, ONLY : trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, & + USE strings_mod, ONLY: msg, fmsg, maxlen, cat, dispTable, int2str, bool2str, strStack, strParse + USE readTracFiles_mod, ONLY: trac_type, readTracersFiles, tracers, setGeneration, itZonIso, nzone, tran0, isoZone, & delPhase, niso, getKey, isot_type, processIsotopes, isotope, maxTableWidth, iqIsoPha, nphas, ixIso, isoPhas, & addPhase, iH2O, addKey, isoSelect, testTracersFiles, isoKeys, indexUpdate, iqWIsoPha, nbIso, ntiso, isoName, isoCheck @@ -113,9 +113,9 @@ SUBROUTINE init_infotrac - USE control_mod, ONLY : planet_type + USE control_mod, ONLY: planet_type #ifdef REPROBUS USE CHEM_REP, ONLY: Init_chem_rep_trac #endif - USE lmdz_cppkeys_wrapper, ONLY : CPPKEY_INCA, CPPKEY_STRATAER + USE lmdz_cppkeys_wrapper, ONLY: CPPKEY_INCA, CPPKEY_STRATAER IMPLICIT NONE !============================================================================================================================== Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/iniconst.F90 (revision 5101) @@ -64,19 +64,19 @@ endif ! but user can also specify using one or the other in run.def: - call getin('disvert_type',disvert_type) + CALL getin('disvert_type',disvert_type) write(lunout,*) trim(modname),': disvert_type=',disvert_type pressure_exner = disvert_type == 1 ! default value - call getin('pressure_exner', pressure_exner) + CALL getin('pressure_exner', pressure_exner) if (disvert_type==1) then ! standard case for Earth (automatic generation of levels) - call disvert() + CALL disvert() else if (disvert_type==2) then ! standard case for planets (levels generated using z2sig.def file) - call disvert_noterre + CALL disvert_noterre else write(abort_message,*) "Wrong value for disvert_type: ", disvert_type - call abort_gcm(modname,abort_message,0) + CALL abort_gcm(modname,abort_message,0) endif Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inidissip.F90 (revision 5101) @@ -11,5 +11,5 @@ ! ------------- - USE control_mod, only : dissip_period,iperiod + USE control_mod, ONLY: dissip_period,iperiod USE comconst_mod, ONLY: dissip_deltaz, dissip_factz, dissip_zref, & dtdiss, dtvr, rad @@ -79,5 +79,5 @@ write(lunout,*)' Inidissip zh min max ',zhmin,zhmax abort_message='probleme generateur alleatoire dans inidissip' - call abort_gcm('inidissip',abort_message,1) + CALL abort_gcm('inidissip',abort_message,1) ENDIF Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initdynav.F90 (revision 5101) @@ -6,6 +6,6 @@ USE IOIPSL #endif - USE infotrac, ONLY : nqtot - use com_io_dyn_mod, only : histaveid,histvaveid,histuaveid, & + USE infotrac, ONLY: nqtot + use com_io_dyn_mod, ONLY: histaveid,histvaveid,histuaveid, & dynhistave_file,dynhistvave_file,dynhistuave_file USE comconst_mod, ONLY: pi @@ -83,5 +83,5 @@ ! Restriction de IOIPSL: seulement 2 coordonnees dans le meme fichier ! Grille Scalaire - call histbeg(dynhistave_file, iip1, rlong(:,1), jjp1, rlat(1,:), & + CALL histbeg(dynhistave_file, iip1, rlong(:,1), jjp1, rlat(1,:), & 1, iip1, 1, jjp1, & tau0, zjulian, tstep, thoriid,histaveid) @@ -98,5 +98,5 @@ enddo - call histbeg(dynhistvave_file, iip1, rlong(:,1), jjm, rlat(1,:), & + CALL histbeg(dynhistvave_file, iip1, rlong(:,1), jjm, rlat(1,:), & 1, iip1, 1, jjm, & tau0, zjulian, tstep, vhoriid,histvaveid) @@ -109,5 +109,5 @@ enddo - call histbeg(dynhistuave_file, iip1, rlong(:,1),jjp1, rlat(1,:), & + CALL histbeg(dynhistuave_file, iip1, rlong(:,1),jjp1, rlat(1,:), & 1, iip1, 1, jjp1, & tau0, zjulian, tstep, uhoriid,histuaveid) @@ -115,9 +115,9 @@ ! Appel a histvert pour la grille verticale - call histvert(histaveid,'presnivs','Niveaux Pression approximatifs','mb', & + CALL histvert(histaveid,'presnivs','Niveaux Pression approximatifs','mb', & llm, presnivs/100., zvertiid,'down') - call histvert(histuaveid,'presnivs','Niveaux Pression approximatifs','mb', & + CALL histvert(histuaveid,'presnivs','Niveaux Pression approximatifs','mb', & llm, presnivs/100., zvertiid,'down') - call histvert(histvaveid,'presnivs','Niveaux Pression approximatifs','mb', & + CALL histvert(histvaveid,'presnivs','Niveaux Pression approximatifs','mb', & llm, presnivs/100., zvertiid,'down') @@ -126,5 +126,5 @@ ! Vents U - call histdef(histuaveid, 'u', 'vent u moyen ', & + CALL histdef(histuaveid, 'u', 'vent u moyen ', & 'm/s', iip1, jjp1, uhoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -132,5 +132,5 @@ ! Vents V - call histdef(histvaveid, 'v', 'vent v moyen', & + CALL histdef(histvaveid, 'v', 'vent v moyen', & 'm/s', iip1, jjm, vhoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -139,5 +139,5 @@ ! Temperature - call histdef(histaveid, 'temp', 'temperature moyenne', 'K', & + CALL histdef(histaveid, 'temp', 'temperature moyenne', 'K', & iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -145,5 +145,5 @@ ! Temperature potentielle - call histdef(histaveid, 'theta', 'temperature potentielle', 'K', & + CALL histdef(histaveid, 'theta', 'temperature potentielle', 'K', & iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -151,5 +151,5 @@ ! Geopotentiel - call histdef(histaveid, 'phi', 'geopotentiel moyen', '-', & + CALL histdef(histaveid, 'phi', 'geopotentiel moyen', '-', & iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -158,5 +158,5 @@ ! DO iq=1,nqtot - ! call histdef(histaveid, tracers(iq)%name, & + ! CALL histdef(histaveid, tracers(iq)%name, & ! tracers(iq)%longName, '-', & ! iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & @@ -166,5 +166,5 @@ ! Masse - call histdef(histaveid, 'masse', 'masse', 'kg', & + CALL histdef(histaveid, 'masse', 'masse', 'kg', & iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & 32, 'ave(X)', t_ops, t_wrt) @@ -172,5 +172,5 @@ ! Pression au sol - call histdef(histaveid, 'ps', 'pression naturelle au sol', 'Pa', & + CALL histdef(histaveid, 'ps', 'pression naturelle au sol', 'Pa', & iip1, jjp1, thoriid, 1, 1, 1, -99, & 32, 'ave(X)', t_ops, t_wrt) @@ -178,11 +178,11 @@ ! Geopotentiel au sol - ! call histdef(histaveid, 'phis', 'geopotentiel au sol', '-', & + ! CALL histdef(histaveid, 'phis', 'geopotentiel au sol', '-', & ! iip1, jjp1, thoriid, 1, 1, 1, -99, & ! 32, 'ave(X)', t_ops, t_wrt) - call histend(histaveid) - call histend(histuaveid) - call histend(histvaveid) + CALL histend(histaveid) + CALL histend(histuaveid) + CALL histend(histvaveid) #else write(lunout,*)"initdynav: Warning this routine should not be", & Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/initfluxsto.F (revision 5101) @@ -92,5 +92,5 @@ enddo - call histbeg(infile, iip1, rlong(:,1), jjp1, rlat(1,:), + CALL histbeg(infile, iip1, rlong(:,1), jjp1, rlat(1,:), . 1, iip1, 1, jjp1, . tau0, zjulian, tstep, uhoriid, fileid) @@ -108,10 +108,10 @@ enddo - call histbeg('fluxstokev.nc', iip1, rlong(:,1), jjm, rlat(1,:), + CALL histbeg('fluxstokev.nc', iip1, rlong(:,1), jjm, rlat(1,:), . 1, iip1, 1, jjm, . tau0, zjulian, tstep, vhoriid, filevid) rl(1,1) = 1. - call histbeg('defstoke.nc', 1, rl, 1, rl, + CALL histbeg('defstoke.nc', 1, rl, 1, rl, . 1, 1, 1, 1, . tau0, zjulian, tstep, dhoriid, filedid) @@ -127,5 +127,5 @@ enddo - call histhori(fileid, iip1, rlong, jjp1, rlat, 'scalar', + CALL histhori(fileid, iip1, rlong, jjp1, rlat, 'scalar', . 'Grille points scalaires', thoriid) @@ -133,14 +133,14 @@ C Appel a histvert pour la grille verticale C - call histvert(fileid, 'sig_s', 'Niveaux sigma', + CALL histvert(fileid, 'sig_s', 'Niveaux sigma', . 'sigma_level', . llm, nivsigs, zvertiid) C Pour le fichier V - call histvert(filevid, 'sig_s', 'Niveaux sigma', + CALL histvert(filevid, 'sig_s', 'Niveaux sigma', . 'sigma_level', . llm, nivsigs, zvertiid) c pour le fichier def nivd(1) = 1 - call histvert(filedid, 'sig_s', 'Niveaux sigma', + CALL histvert(filedid, 'sig_s', 'Niveaux sigma', . 'sigma_level', . 1, nivd, dvertiid) @@ -173,5 +173,5 @@ C Masse C - call histdef(fileid, 'masse', 'Masse', 'kg', + CALL histdef(fileid, 'masse', 'Masse', 'kg', . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -179,5 +179,5 @@ C Pbaru C - call histdef(fileid, 'pbaru', 'flx de masse zonal', 'kg m/s', + CALL histdef(fileid, 'pbaru', 'flx de masse zonal', 'kg m/s', . iip1, jjp1, uhoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -186,5 +186,5 @@ C Pbarv C - call histdef(filevid, 'pbarv', 'flx de masse mer', 'kg m/s', + CALL histdef(filevid, 'pbarv', 'flx de masse mer', 'kg m/s', . iip1, jjm, vhoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -192,5 +192,5 @@ C w C - call histdef(fileid, 'w', 'flx de masse vert', 'kg m/s', + CALL histdef(fileid, 'w', 'flx de masse vert', 'kg m/s', . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -199,5 +199,5 @@ C Temperature potentielle C - call histdef(fileid, 'teta', 'temperature potentielle', '-', + CALL histdef(fileid, 'teta', 'temperature potentielle', '-', . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -207,5 +207,5 @@ C Geopotentiel C - call histdef(fileid, 'phi', 'geopotentiel instantane', '-', + CALL histdef(fileid, 'phi', 'geopotentiel instantane', '-', . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, . 32, 'inst(X)', t_ops, t_wrt) @@ -213,11 +213,11 @@ C Fin C - call histend(fileid) - call histend(filevid) - call histend(filedid) + CALL histend(fileid) + CALL histend(filevid) + CALL histend(filedid) if (ok_sync) then - call histsync(fileid) - call histsync(filevid) - call histsync(filedid) + CALL histsync(fileid) + CALL histsync(filevid) + CALL histsync(filedid) endif Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F (revision 5100) +++ (revision ) @@ -1,195 +1,0 @@ - -! $Id$ - - subroutine inithist(day0,anne0,tstep,t_ops,t_wrt) - -#ifdef CPP_IOIPSL - USE IOIPSL -#endif - USE infotrac, ONLY : nqtot - use com_io_dyn_mod, only : histid,histvid,histuid, & - & dynhist_file,dynhistv_file,dynhistu_file - USE comconst_mod, ONLY: pi - USE comvert_mod, ONLY: presnivs - USE temps_mod, ONLY: itau_dyn - - implicit none - -C -C Routine d'initialisation des ecritures des fichiers histoires LMDZ -C au format IOIPSL -C -C Appels succesifs des routines: histbeg -C histhori -C histver -C histdef -C histend -C -C Entree: -C -C infile: nom du fichier histoire a creer -C day0,anne0: date de reference -C tstep: duree du pas de temps en seconde -C t_ops: frequence de l'operation pour IOIPSL -C t_wrt: frequence d'ecriture sur le fichier -C nq: nombre de traceurs -C -C -C L. Fairhead, LMD, 03/99 -C -C ===================================================================== -C -C Declarations - include "dimensions.h" - include "paramet.h" - include "comgeom.h" - include "description.h" - include "iniprint.h" - -C Arguments -C - integer day0, anne0 - real tstep, t_ops, t_wrt - -#ifdef CPP_IOIPSL -! This routine needs IOIPSL to work -C Variables locales -C - integer tau0 - real zjulian - integer iq - real rlong(iip1,jjp1), rlat(iip1,jjp1) - integer uhoriid, vhoriid, thoriid, zvertiid - integer ii,jj - integer zan, dayref -C -C Initialisations -C - pi = 4. * atan (1.) -C -C Appel a histbeg: creation du fichier netcdf et initialisations diverses -C - - zan = anne0 - dayref = day0 - CALL ymds2ju(zan, 1, dayref, 0.0, zjulian) - tau0 = itau_dyn - -! ------------------------------------------------------------- -! Creation des 3 fichiers pour les grilles horizontales U,V,Scal -! ------------------------------------------------------------- -!Grille U - do jj = 1, jjp1 - do ii = 1, iip1 - rlong(ii,jj) = rlonu(ii) * 180. / pi - rlat(ii,jj) = rlatu(jj) * 180. / pi - enddo - enddo - - call histbeg(dynhistu_file, iip1, rlong(:,1), jjp1, rlat(1,:), - . 1, iip1, 1, jjp1, - . tau0, zjulian, tstep, uhoriid, histuid) - -! Grille V - do jj = 1, jjm - do ii = 1, iip1 - rlong(ii,jj) = rlonv(ii) * 180. / pi - rlat(ii,jj) = rlatv(jj) * 180. / pi - enddo - enddo - - call histbeg(dynhistv_file, iip1, rlong(:,1), jjm, rlat(1,:), - . 1, iip1, 1, jjm, - . tau0, zjulian, tstep, vhoriid, histvid) - -!Grille Scalaire - do jj = 1, jjp1 - do ii = 1, iip1 - rlong(ii,jj) = rlonv(ii) * 180. / pi - rlat(ii,jj) = rlatu(jj) * 180. / pi - enddo - enddo - - call histbeg(dynhist_file, iip1, rlong(:,1), jjp1, rlat(1,:), - . 1, iip1, 1, jjp1, - . tau0, zjulian, tstep, thoriid, histid) -! ------------------------------------------------------------- -C Appel a histvert pour la grille verticale -! ------------------------------------------------------------- - call histvert(histid, 'presnivs', 'Niveaux pression','mb', - . llm, presnivs/100., zvertiid,'down') - call histvert(histvid, 'presnivs', 'Niveaux pression','mb', - . llm, presnivs/100., zvertiid,'down') - call histvert(histuid, 'presnivs', 'Niveaux pression','mb', - . llm, presnivs/100., zvertiid,'down') -C -! ------------------------------------------------------------- -C Appels a histdef pour la definition des variables a sauvegarder -! ------------------------------------------------------------- -C -C Vents U -C - call histdef(histuid, 'u', 'vent u', 'm/s', - . iip1, jjp1, uhoriid, llm, 1, llm, zvertiid, - . 32, 'inst(X)', t_ops, t_wrt) -C -C Vents V -C - call histdef(histvid, 'v', 'vent v', 'm/s', - . iip1, jjm, vhoriid, llm, 1, llm, zvertiid, - . 32, 'inst(X)', t_ops, t_wrt) - -C -C Temperature potentielle -C - call histdef(histid, 'teta', 'temperature potentielle', '-', - . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, - . 32, 'inst(X)', t_ops, t_wrt) -C -C Geopotentiel -C - call histdef(histid, 'phi', 'geopotentiel', '-', - . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, - . 32, 'inst(X)', t_ops, t_wrt) -C -C Traceurs -C - -! DO iq=1,nqtot -! call histdef(histid, tracers(iq)%name, -! tracers(iq)%longName, '-', -! . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, -! . 32, 'inst(X)', t_ops, t_wrt) -! enddo -!C -C Masse -C - call histdef(histid, 'masse', 'masse', 'kg', - . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, - . 32, 'inst(X)', t_ops, t_wrt) -C -C Pression au sol -C - call histdef(histid, 'ps', 'pression naturelle au sol', 'Pa', - . iip1, jjp1, thoriid, 1, 1, 1, -99, - . 32, 'inst(X)', t_ops, t_wrt) -C -C Geopotentiel au sol -!C -! call histdef(histid, 'phis', 'geopotentiel au sol', '-', -! . iip1, jjp1, thoriid, 1, 1, 1, -99, -! . 32, 'inst(X)', t_ops, t_wrt) -!C -C Fin -C - call histend(histid) - call histend(histuid) - call histend(histvid) -#else -! tell the user this routine should be run with ioipsl - write(lunout,*)"inithist: Warning this routine should not be", - & " used without ioipsl" -#endif -! of #ifdef CPP_IOIPSL - return - end Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90 (revision 5101) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inithist.F90 (revision 5101) @@ -0,0 +1,194 @@ +! $Id$ + +subroutine inithist(day0, anne0, tstep, t_ops, t_wrt) + +#ifdef CPP_IOIPSL + USE IOIPSL +#endif + USE infotrac, ONLY: nqtot + use com_io_dyn_mod, ONLY: histid, histvid, histuid, & + dynhist_file, dynhistv_file, dynhistu_file + USE comconst_mod, ONLY: pi + USE comvert_mod, ONLY: presnivs + USE temps_mod, ONLY: itau_dyn + + implicit none + + ! + ! Routine d'initialisation des ecritures des fichiers histoires LMDZ + ! au format IOIPSL + ! + ! Appels succesifs des routines: histbeg + ! histhori + ! histver + ! histdef + ! histend + ! + ! Entree: + ! + ! infile: nom du fichier histoire a creer + ! day0,anne0: date de reference + ! tstep: duree du pas de temps en seconde + ! t_ops: frequence de l'operation pour IOIPSL + ! t_wrt: frequence d'ecriture sur le fichier + ! nq: nombre de traceurs + ! + ! + ! L. Fairhead, LMD, 03/99 + ! + ! ===================================================================== + ! + ! Declarations + include "dimensions.h" + include "paramet.h" + include "comgeom.h" + include "description.h" + include "iniprint.h" + + ! Arguments + ! + integer :: day0, anne0 + real :: tstep, t_ops, t_wrt + +#ifdef CPP_IOIPSL + ! This routine needs IOIPSL to work + ! Variables locales + ! + integer :: tau0 + real :: zjulian + integer :: iq + real :: rlong(iip1,jjp1), rlat(iip1,jjp1) + integer :: uhoriid, vhoriid, thoriid, zvertiid + integer :: ii,jj + integer :: zan, dayref + ! + ! Initialisations + ! + pi = 4. * atan (1.) + ! + ! Appel a histbeg: creation du fichier netcdf et initialisations diverses + ! + + zan = anne0 + dayref = day0 + CALL ymds2ju(zan, 1, dayref, 0.0, zjulian) + tau0 = itau_dyn + + ! ------------------------------------------------------------- + ! Creation des 3 fichiers pour les grilles horizontales U,V,Scal + ! ------------------------------------------------------------- + !Grille U + do jj = 1, jjp1 + do ii = 1, iip1 + rlong(ii,jj) = rlonu(ii) * 180. / pi + rlat(ii,jj) = rlatu(jj) * 180. / pi + enddo + enddo + + CALL histbeg(dynhistu_file, iip1, rlong(:,1), jjp1, rlat(1,:), & + 1, iip1, 1, jjp1, & + tau0, zjulian, tstep, uhoriid, histuid) + + ! Grille V + do jj = 1, jjm + do ii = 1, iip1 + rlong(ii,jj) = rlonv(ii) * 180. / pi + rlat(ii,jj) = rlatv(jj) * 180. / pi + enddo + enddo + + CALL histbeg(dynhistv_file, iip1, rlong(:,1), jjm, rlat(1,:), & + 1, iip1, 1, jjm, & + tau0, zjulian, tstep, vhoriid, histvid) + + !Grille Scalaire + do jj = 1, jjp1 + do ii = 1, iip1 + rlong(ii,jj) = rlonv(ii) * 180. / pi + rlat(ii,jj) = rlatu(jj) * 180. / pi + enddo + enddo + + CALL histbeg(dynhist_file, iip1, rlong(:,1), jjp1, rlat(1,:), & + 1, iip1, 1, jjp1, & + tau0, zjulian, tstep, thoriid, histid) + ! ------------------------------------------------------------- + ! Appel a histvert pour la grille verticale + ! ------------------------------------------------------------- + CALL histvert(histid, 'presnivs', 'Niveaux pression','mb', & + llm, presnivs/100., zvertiid,'down') + CALL histvert(histvid, 'presnivs', 'Niveaux pression','mb', & + llm, presnivs/100., zvertiid,'down') + CALL histvert(histuid, 'presnivs', 'Niveaux pression','mb', & + llm, presnivs/100., zvertiid,'down') + ! + ! ------------------------------------------------------------- + ! Appels a histdef pour la definition des variables a sauvegarder + ! ------------------------------------------------------------- + ! + ! Vents U + ! + CALL histdef(histuid, 'u', 'vent u', 'm/s', & + iip1, jjp1, uhoriid, llm, 1, llm, zvertiid, & + 32, 'inst(X)', t_ops, t_wrt) + ! + ! Vents V + ! + CALL histdef(histvid, 'v', 'vent v', 'm/s', & + iip1, jjm, vhoriid, llm, 1, llm, zvertiid, & + 32, 'inst(X)', t_ops, t_wrt) + + ! + ! Temperature potentielle + ! + CALL histdef(histid, 'teta', 'temperature potentielle', '-', & + iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & + 32, 'inst(X)', t_ops, t_wrt) + ! + ! Geopotentiel + ! + CALL histdef(histid, 'phi', 'geopotentiel', '-', & + iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & + 32, 'inst(X)', t_ops, t_wrt) + ! + ! Traceurs + ! + + ! DO iq=1,nqtot + ! CALL histdef(histid, tracers(iq)%name, + ! tracers(iq)%longName, '-', + ! . iip1, jjp1, thoriid, llm, 1, llm, zvertiid, + ! . 32, 'inst(X)', t_ops, t_wrt) + ! enddo + !C + ! Masse + ! + CALL histdef(histid, 'masse', 'masse', 'kg', & + iip1, jjp1, thoriid, llm, 1, llm, zvertiid, & + 32, 'inst(X)', t_ops, t_wrt) + ! + ! Pression au sol + ! + CALL histdef(histid, 'ps', 'pression naturelle au sol', 'Pa', & + iip1, jjp1, thoriid, 1, 1, 1, -99, & + 32, 'inst(X)', t_ops, t_wrt) + ! + ! Geopotentiel au sol + !C + ! CALL histdef(histid, 'phis', 'geopotentiel au sol', '-', + ! . iip1, jjp1, thoriid, 1, 1, 1, -99, + ! . 32, 'inst(X)', t_ops, t_wrt) + !C + ! Fin + ! + CALL histend(histid) + CALL histend(histuid) + CALL histend(histvid) +#else + ! tell the user this routine should be run with ioipsl + write(lunout, *)"inithist: Warning this routine should not be", & + " used without ioipsl" +#endif + ! of #ifdef CPP_IOIPSL + return +end subroutine inithist Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/inter_barxy_m.F90 (revision 5101) @@ -57,9 +57,9 @@ "inter_barxy jnterfd") jmods = size(champint, 2) - call assert(size(champ, 1) == size(dlonid), "inter_barxy size(champ, 1)") - call assert((/size(rlonimod), size(champint, 1)/) == iim, & + CALL assert(size(champ, 1) == size(dlonid), "inter_barxy size(champ, 1)") + CALL assert((/size(rlonimod), size(champint, 1)/) == iim, & "inter_barxy iim") - call assert(any(jmods == (/jjm, jjm + 1/)), 'inter_barxy jmods') - call assert(size(rlatimod) == jjm, "inter_barxy size(rlatimod)") + CALL assert(any(jmods == (/jjm, jjm + 1/)), 'inter_barxy jmods') + CALL assert(size(rlatimod) == jjm, "inter_barxy size(rlatimod)") ! Check decreasing order for "rlatimod": @@ -323,5 +323,5 @@ !------------------------------------ - call assert(size(yjdat) == size(fdat), "inter_bary") + CALL assert(size(yjdat) == size(fdat), "inter_bary") ! Initialisation des variables Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/pentes_ini.F (revision 5101) @@ -257,8 +257,8 @@ enddo endif - call limx(s0,sx,sm,pente_max) -c call minmaxq(zq,1.e33,-1.e33,'avant advx ') - call advx( limit,.5*dtvr,pbaru,sm,s0,sx,sy,sz,lati,latf) -c call minmaxq(zq,1.e33,-1.e33,'avant advy ') + CALL limx(s0,sx,sm,pente_max) +c CALL minmaxq(zq,1.e33,-1.e33,'avant advx ') + CALL advx( limit,.5*dtvr,pbaru,sm,s0,sx,sy,sz,lati,latf) +c CALL minmaxq(zq,1.e33,-1.e33,'avant advy ') if (mode==4) then do l=1,llm @@ -271,7 +271,7 @@ enddo endif - call limy(s0,sy,sm,pente_max) - call advy( limit,.5*dtvr,pbarv,sm,s0,sx,sy,sz ) -c call minmaxq(zq,1.e33,-1.e33,'avant advz ') + CALL limy(s0,sy,sm,pente_max) + CALL advy( limit,.5*dtvr,pbarv,sm,s0,sx,sy,sz ) +c CALL minmaxq(zq,1.e33,-1.e33,'avant advz ') do j=1,jjp1 do i=1,iip1 @@ -280,6 +280,6 @@ enddo enddo - call limz(s0,sz,sm,pente_max) - call advz( limit,dtvr,w,sm,s0,sx,sy,sz ) + CALL limz(s0,sz,sm,pente_max) + CALL advz( limit,dtvr,w,sm,s0,sx,sy,sz ) if (mode==4) then do l=1,llm @@ -292,6 +292,6 @@ enddo endif - call limy(s0,sy,sm,pente_max) - call advy( limit,.5*dtvr,pbarv,sm,s0,sx,sy,sz ) + CALL limy(s0,sy,sm,pente_max) + CALL advy( limit,.5*dtvr,pbarv,sm,s0,sx,sy,sz ) do l=1,llm do j=1,jjp1 @@ -305,5 +305,5 @@ -c call minmaxq(zq,1.e33,-1.e33,'avant advx ') +c CALL minmaxq(zq,1.e33,-1.e33,'avant advx ') if (mode==4) then do l=1,llm @@ -316,7 +316,7 @@ enddo endif - call limx(s0,sx,sm,pente_max) - call advx( limit,.5*dtvr,pbaru,sm,s0,sx,sy,sz,lati,latf) -c call minmaxq(zq,1.e33,-1.e33,'apres advx ') + CALL limx(s0,sx,sm,pente_max) + CALL advx( limit,.5*dtvr,pbaru,sm,s0,sx,sy,sz,lati,latf) +c CALL minmaxq(zq,1.e33,-1.e33,'apres advx ') c do l=1,llm c do j=1,jjp1 Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ppm3d.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ppm3d.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ppm3d.F (revision 5101) @@ -24,5 +24,5 @@ C C Purpose: given horizontal winds on a hybrid sigma-p surfaces, -C one call to tpcore updates the 3-D mixing ratio +C one CALL to tpcore updates the 3-D mixing ratio C fields one time step (NDT). [vertical mass flux is computed C internally consistent with the discretized hydrostatic mass @@ -355,8 +355,8 @@ if(IGD==0) then C Compute analytic cosine at cell edges - call cosa(cosp,cose,JNP,PI,DP) + CALL cosa(cosp,cose,JNP,PI,DP) else C Define cosine consistent with GEOS-GCM (using dycore2.0 or later) - call cosc(cosp,cose,JNP,PI,DP) + CALL cosc(cosp,cose,JNP,PI,DP) endif C @@ -455,5 +455,5 @@ if(IGD==0) then C Convert winds on A-Grid to Courant # on C-Grid. - call A2C(U(1,1,k),V(1,1,k),IMR,JMR,j1,j2,CRX,CRY,dtdx5,DTDY5) + CALL A2C(U(1,1,k),V(1,1,k),IMR,JMR,j1,j2,CRX,CRY,dtdx5,DTDY5) else C Convert winds on C-grid to Courant # @@ -674,6 +674,6 @@ jad = 1 endif - call xadv(IMR,JNP,j1,j2,wk1(1,1,2),UA,JS,JN,IML,DC2,iad) - call yadv(IMR,JNP,j1,j2,wk1(1,1,1),VA,PV,W,jad) + CALL xadv(IMR,JNP,j1,j2,wk1(1,1,2),UA,JS,JN,IML,DC2,iad) + CALL yadv(IMR,JNP,j1,j2,wk1(1,1,1),VA,PV,W,jad) do j=1,JNP do i=1,IMR @@ -683,8 +683,8 @@ endif C - call xtp(IMR,JNP,IML,j1,j2,JN,JS,PU,DQ(1,1,k,IC),wk1(1,1,2) + CALL xtp(IMR,JNP,IML,j1,j2,JN,JS,PU,DQ(1,1,k,IC),wk1(1,1,2) & ,CRX,fx1,xmass,IORD) - call ytp(IMR,JNP,j1,j2,acosp,RCAP,DQ(1,1,k,IC),wk1(1,1,1),CRY, + CALL ytp(IMR,JNP,j1,j2,acosp,RCAP,DQ(1,1,k,IC),wk1(1,1,1),CRY, & DC2,ymass,WK1(1,1,3),wk1(1,1,4),WK1(1,1,5),WK1(1,1,6),JORD) C @@ -746,9 +746,9 @@ C****6***0*********0*********0*********0*********0*********0**********72 - call FZPPM(IMR,JNP,NLAY,j1,DQ(1,1,1,IC),W,Q(1,1,1,IC),WK1,DPI, + CALL FZPPM(IMR,JNP,NLAY,j1,DQ(1,1,1,IC),W,Q(1,1,1,IC),WK1,DPI, & DC2,CRX,CRY,PU,PV,xmass,ymass,delp1,KRD) C - if(fill) call qckxyz(DQ(1,1,1,IC),DC2,IMR,JNP,NLAY,j1,j2, + if(fill) CALL qckxyz(DQ(1,1,1,IC),DC2,IMR,JNP,NLAY,j1,j2, & cosp,acosp,.false.,IC,NSTEP) C @@ -921,11 +921,11 @@ C****6***0*********0*********0*********0*********0*********0**********72 C Top & Bot always monotonic - call lmtppm(flux(1,1),A6(1,1),AR(1,1),AL(1,1),wk1(1,1),IMR,0) - call lmtppm(flux(1,NLAY),A6(1,NLAY),AR(1,NLAY),AL(1,NLAY), + CALL lmtppm(flux(1,1),A6(1,1),AR(1,1),AL(1,1),wk1(1,1),IMR,0) + CALL lmtppm(flux(1,NLAY),A6(1,NLAY),AR(1,NLAY),AL(1,NLAY), & wk1(1,NLAY),IMR,0) C C Interior depending on KORD if(LMT<=2) - & call lmtppm(flux(1,2),A6(1,2),AR(1,2),AL(1,2),wk1(1,2), + & CALL lmtppm(flux(1,2),A6(1,2),AR(1,2),AL(1,2),wk1(1,2), & IMR*(NLAY-2),LMT) C @@ -1004,5 +1004,5 @@ END DO ELSE - call xmist(IMR,IML,Qtmp,DC) + CALL xmist(IMR,IML,Qtmp,DC) DC(0) = DC(IMR) C @@ -1013,5 +1013,5 @@ END DO else - call fxppm(IMR,IML,UC(1,j),Qtmp,DC,fx1,IORD) + CALL fxppm(IMR,IML,UC(1,j),Qtmp,DC,fx1,IORD) endif C @@ -1041,5 +1041,5 @@ END DO ELSE - call xmist(IMR,IML,Qtmp,DC) + CALL xmist(IMR,IML,Qtmp,DC) C do i=-IML,0 @@ -1132,5 +1132,5 @@ END DO C - if(LMT<=2) call lmtppm(DC(1),A6(1),AR(1),AL(1),P(1),IMR,LMT) + if(LMT<=2) CALL lmtppm(DC(1),A6(1),AR(1),AL(1),P(1),IMR,LMT) C AL(0) = AL(IMR) @@ -1189,9 +1189,9 @@ else - call ymist(IMR,JNP,j1,P,DC2,4) + CALL ymist(IMR,JNP,j1,P,DC2,4) C if(JORD<=0 .or. JORD>=3) then - call fyppm(VC,P,DC2,fx,IMR,JNP,j1,j2,A6,AR,AL,JORD) + CALL fyppm(VC,P,DC2,fx,IMR,JNP,j1,j2,A6,AR,AL,JORD) else @@ -1384,5 +1384,5 @@ END DO C - if(LMT<=2) call lmtppm(DC(1,j11),A6(1,j11),AR(1,j11) + if(LMT<=2) CALL lmtppm(DC(1,j11),A6(1,j11),AR(1,j11) & ,AL(1,j11),P(1,j11),len,LMT) C @@ -1761,11 +1761,11 @@ L = 1 icr = 1 - call filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) + CALL filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) if(ipy==0) goto 50 - call filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) + CALL filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) if(ipx==0) goto 50 C if(cross) then - call filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) + CALL filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) endif if(icr==0) goto 50 @@ -1784,10 +1784,10 @@ icr = 1 C - call filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) + CALL filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) if(ipy==0) goto 225 - call filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) + CALL filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) if(ipx==0) go to 225 if(cross) then - call filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) + CALL filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) endif if(icr==0) goto 225 @@ -1815,10 +1815,10 @@ L = NLAY C - call filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) + CALL filns(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,ipy,tiny) if(ipy==0) goto 911 - call filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) + CALL filew(q(1,1,L),qtmp,IMR,JNP,j1,j2,ipx,tiny) if(ipx==0) goto 911 C - call filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) + CALL filcr(q(1,1,L),IMR,JNP,j1,j2,cosp,acosp,icr,tiny) if(icr==0) goto 911 C Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/prather.F (revision 5101) @@ -147,5 +147,5 @@ c----------------------------------------------------------- do indice =1,nt - call advxp( limit,0.5*dt,pbaru,sm,s0,sx,sy,sz + CALL advxp( limit,0.5*dt,pbaru,sm,s0,sx,sy,sz . ,sxx,sxy,sxz,syy,syz,szz,1 ) END DO @@ -157,5 +157,5 @@ enddo c--------------------------------------------------------- - call advyp( limit,.5*dt*nt,pbarv,sm,s0,sx,sy,sz + CALL advyp( limit,.5*dt*nt,pbarv,sm,s0,sx,sy,sz . ,sxx,sxy,sxz,syy,syz,szz,1 ) c--------------------------------------------------------- @@ -174,5 +174,5 @@ enddo enddo - call advzp( limit,dt*nt,w,sm,s0,sx,sy,sz + CALL advzp( limit,dt*nt,w,sm,s0,sx,sy,sz . ,sxx,sxy,sxz,syy,syz,szz,1 ) do l=1,llm @@ -186,5 +186,5 @@ c--------------------------------------------------------- - call advyp( limit,.5*dt*nt,pbarv,sm,s0,sx,sy,sz + CALL advyp( limit,.5*dt*nt,pbarv,sm,s0,sx,sy,sz . ,sxx,sxy,sxz,syy,syz,szz,1 ) c--------------------------------------------------------- @@ -204,5 +204,5 @@ ENDDO do indice=1,nt - call advxp( limit,0.5*dt,pbaru,sm,s0,sx,sy,sz + CALL advxp( limit,0.5*dt,pbaru,sm,s0,sx,sy,sz . ,sxx,sxy,sxz,syy,syz,szz,1 ) END DO Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/rotatf.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/rotatf.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/rotatf.F (revision 5101) @@ -9,5 +9,5 @@ c a tous les niveaux d'1 vecteur de comp. x et y .. c x et y etant des composantes covariantes ... -c Only difference with rotat: call to filtreg. +c Only difference with rotat: CALL to filtreg. c******************************************************************** c klevel, x et y sont des arguments d'entree pour le s-prog Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/test_period.F (revision 5101) @@ -9,5 +9,5 @@ c teta, q , p et phis .......... c - USE infotrac, ONLY : nqtot + USE infotrac, ONLY: nqtot c c IMPLICIT NONE Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/ugeostr.F90 (revision 5101) @@ -48,5 +48,5 @@ ENDDO ENDDO - call dump2d(jjm,llm,um,'Vent-u geostrophique') + CALL dump2d(jjm,llm,um,'Vent-u geostrophique') ! calcul des champ de vent: Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/write_grads_dyn.h =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/write_grads_dyn.h (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/write_grads_dyn.h (revision 5101) @@ -5,5 +5,5 @@ string10='dyn' - call inigrads(1,iip1 + CALL inigrads(1,iip1 s ,rlonv,180./pi,-180.,180.,jjp1,rlatu,-90.,90.,180./pi s ,llm,presnivs,1. Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90 =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90 (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writedynav.F90 (revision 5101) @@ -6,6 +6,6 @@ USE ioipsl #endif - USE infotrac, ONLY : nqtot - use com_io_dyn_mod, only : histaveid, histvaveid, histuaveid + USE infotrac, ONLY: nqtot + use com_io_dyn_mod, ONLY: histaveid, histvaveid, histuaveid USE comconst_mod, ONLY: cpp USE temps_mod, ONLY: itau_dyn @@ -71,5 +71,5 @@ ! Passage aux composantes naturelles du vent - call covnat(llm, ucov, vcov, unat, vnat) + CALL covnat(llm, ucov, vcov, unat, vnat) ! Appels a histwrite pour l'ecriture des variables a sauvegarder @@ -77,15 +77,15 @@ ! Vents U - call histwrite(histuaveid, 'u', itau_w, unat, & + CALL histwrite(histuaveid, 'u', itau_w, unat, & iip1*jjp1*llm, ndexu) ! Vents V - call histwrite(histvaveid, 'v', itau_w, vnat, & + CALL histwrite(histvaveid, 'v', itau_w, vnat, & iip1*jjm*llm, ndexv) ! Temperature potentielle moyennee - call histwrite(histaveid, 'theta', itau_w, teta, & + CALL histwrite(histaveid, 'theta', itau_w, teta, & iip1*jjp1*llm, ndexu) @@ -95,10 +95,10 @@ tm(ii) = teta(ii) * ppk(ii)/cpp enddo - call histwrite(histaveid, 'temp', itau_w, tm, & + CALL histwrite(histaveid, 'temp', itau_w, tm, & iip1*jjp1*llm, ndexu) ! Geopotentiel - call histwrite(histaveid, 'phi', itau_w, phi, & + CALL histwrite(histaveid, 'phi', itau_w, phi, & iip1*jjp1*llm, ndexu) @@ -106,5 +106,5 @@ ! DO iq=1, nqtot - ! call histwrite(histaveid, tracers(iq)%longName, itau_w, & + ! CALL histwrite(histaveid, tracers(iq)%longName, itau_w, & ! q(:, :, iq), iip1*jjp1*llm, ndexu) ! enddo @@ -112,19 +112,19 @@ ! Masse - call histwrite(histaveid, 'masse', itau_w, masse, & + CALL histwrite(histaveid, 'masse', itau_w, masse, & iip1*jjp1*llm, ndexu) ! Pression au sol - call histwrite(histaveid, 'ps', itau_w, ps, iip1*jjp1, ndex2d) + CALL histwrite(histaveid, 'ps', itau_w, ps, iip1*jjp1, ndex2d) ! Geopotentiel au sol - ! call histwrite(histaveid, 'phis', itau_w, phis, iip1*jjp1, ndex2d) + ! CALL histwrite(histaveid, 'phis', itau_w, phis, iip1*jjp1, ndex2d) if (ok_sync) then - call histsync(histaveid) - call histsync(histvaveid) - call histsync(histuaveid) + CALL histsync(histaveid) + CALL histsync(histvaveid) + CALL histsync(histuaveid) ENDIF Index: LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.F =================================================================== --- LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.F (revision 5100) +++ LMDZ6/branches/Amaury_dev/libf/dyn3d_common/writehist.F (revision 5101) @@ -7,6 +7,6 @@ USE ioipsl #endif - USE infotrac, ONLY : nqtot - use com_io_dyn_mod, only : histid,histvid,histuid + USE infotrac, ONLY: nqtot + use com_io_dyn_mod, ONLY: histid,histvid,histuid USE temps_mod, ONLY: itau_dyn @@ -72,5 +72,5 @@ itau_w = itau_dyn + time ! Passage aux composantes naturelles du vent - call covnat(llm, ucov, vcov, unat, vnat) + CALL covnat(llm, ucov, vcov, unat, vnat) C C Appels a histwrite pour l'ecriture des variables a sauvegarder @@ -78,10 +78,10 @@ C Vents U C - call histwrite(histuid, 'u', itau_w, unat, + CALL histwrite(histuid, 'u', itau_w, unat, . iip1*jjp1*llm, ndexu) C C Vents V C - call histwrite(histvid, 'v', itau_w, vnat, + CALL histwrite(histvid, 'v', itau_w, vnat, . iip1*jjm*llm, ndexv) @@ -89,10 +89,10 @@ C Temperature potentielle C - call histwrite(histid, 'teta', itau_w, teta, + CALL histwrite(histid, 'teta', itau_w, teta, . iip1*jjp1*llm, ndexu) C C Geopotentiel C - call histwrite(histid, 'phi', itau_w, phi, + CALL histwrite(histid, 'phi', itau_w, phi, . iip1*jjp1*llm, ndexu) C @@ -100,5 +100,5 @@ C ! DO iq=1,nqtot -! call histwrite(histid, tracers(iq)%longName, itau_w, +! CALL histwrite(histid, tracers(iq)%longName, itau_w, ! . q(:,:,iq), iip1*jjp1*llm, ndexu) ! enddo @@ -106,20 +106,20 @@ C Masse C - call histwrite(histid,'masse',itau_w, masse,iip1*jjp1*llm,ndexu) + CALL histwrite(histid,'masse',itau_w, masse,iip1*jjp1*llm,ndexu) C C Pression au sol C - call histwrite(histid, 'ps', itau_w, ps, iip1*jjp1, ndex2d) + CALL histwrite(histid, 'ps', itau_w, ps, iip1*jjp1, ndex2d) C C Geopotentiel au sol C -! call histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d) +! CALL histwrite(histid, 'phis', itau_w, phis, iip1*jjp1, ndex2d) C C Fin C if (ok_sync) then - call histsync(histid) - call histsync(histvid) - call histsync(histuid) + CALL histsync(histid) + CALL histsync(histvid) + CALL histsync(histuid) endif #else