Changeset 1910 for LMDZ5/branches/testing/libf/dyn3dmem

Timestamp:

Nov 29, 2013, 9:40:25 AM (11 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r1860:1909 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (2 props)
• libf (modified) (1 prop)
• libf/dyn3dmem (modified) (1 prop)
• libf/dyn3dmem/PVtheta.F (modified) (1 prop)
• libf/dyn3dmem/abort_gcm.F (modified) (1 prop)
• libf/dyn3dmem/academic.h (modified) (1 prop)
• libf/dyn3dmem/adaptdt.F (modified) (1 prop)
• libf/dyn3dmem/addfi_loc.F (modified) (1 prop)
• libf/dyn3dmem/advect_new_loc.F (modified) (1 prop)
• libf/dyn3dmem/advect_new_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/advn.F (modified) (1 prop)
• libf/dyn3dmem/advtrac_loc.F (modified) (1 prop)
• libf/dyn3dmem/advtrac_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/advx.F (modified) (1 prop)
• libf/dyn3dmem/advxp.F (modified) (1 prop)
• libf/dyn3dmem/advy.F (modified) (1 prop)
• libf/dyn3dmem/advyp.F (modified) (1 prop)
• libf/dyn3dmem/advz.F (modified) (1 prop)
• libf/dyn3dmem/advzp.F (modified) (1 prop)
• libf/dyn3dmem/allocate_field_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/bands.F90 (modified) (1 prop)
• libf/dyn3dmem/bernoui.F (modified) (1 prop)
• libf/dyn3dmem/bernoui_loc.F (modified) (1 prop)
• libf/dyn3dmem/bilan_dyn_loc.F (modified) (6 diffs, 1 prop)
• libf/dyn3dmem/caladvtrac_loc.F (modified) (1 prop)
• libf/dyn3dmem/caladvtrac_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/caldyn0.F (modified) (1 prop)
• libf/dyn3dmem/caldyn_loc.F (modified) (1 prop)
• libf/dyn3dmem/caldyn_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/calfis_loc.F (modified) (1 prop)
• libf/dyn3dmem/call_calfis_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/call_dissip_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/ce0l.F90 (modified) (1 prop)
• libf/dyn3dmem/clesph0.h (modified) (1 prop)
• libf/dyn3dmem/coefpoly.F (modified) (1 prop)
• libf/dyn3dmem/com_io_dyn_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/comconst.h (modified) (1 prop)
• libf/dyn3dmem/comdissip.h (modified) (1 prop)
• libf/dyn3dmem/comdissipn.h (modified) (1 prop)
• libf/dyn3dmem/comdissnew.h (modified) (1 prop)
• libf/dyn3dmem/comgeom.h (modified) (1 prop)
• libf/dyn3dmem/comgeom2.h (modified) (1 prop)
• libf/dyn3dmem/comvert.h (modified) (1 prop)
• libf/dyn3dmem/conf_dat2d.F (modified) (1 prop)
• libf/dyn3dmem/conf_dat3d.F (modified) (1 prop)
• libf/dyn3dmem/conf_gcm.F (modified) (1 prop)
• libf/dyn3dmem/conf_planete.F90 (modified) (1 prop)
• libf/dyn3dmem/control_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/convflu.F (modified) (1 prop)
• libf/dyn3dmem/convflu_loc.F (modified) (1 prop)
• libf/dyn3dmem/convmas.F (modified) (1 prop)
• libf/dyn3dmem/convmas1_loc.F (modified) (1 prop)
• libf/dyn3dmem/convmas2_loc.F (modified) (1 prop)
• libf/dyn3dmem/convmas_loc.F (modified) (1 prop)
• libf/dyn3dmem/coordij.F (modified) (1 prop)
• libf/dyn3dmem/covcont.F (modified) (1 prop)
• libf/dyn3dmem/covcont_loc.F (modified) (1 prop)
• libf/dyn3dmem/covnat_loc.F (modified) (1 prop)
• libf/dyn3dmem/defrun.F (modified) (1 prop)
• libf/dyn3dmem/description.h (modified) (1 prop)
• libf/dyn3dmem/diagedyn.F (modified) (1 prop)
• libf/dyn3dmem/dimensions_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/dissip_loc.F (modified) (1 prop)
• libf/dyn3dmem/dissip_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/disvert.F90 (modified) (1 prop)
• libf/dyn3dmem/disvert_noterre.F (modified) (1 prop)
• libf/dyn3dmem/diverg.F (modified) (1 prop)
• libf/dyn3dmem/diverg_gam.F (modified) (1 prop)
• libf/dyn3dmem/diverg_gam_loc.F (modified) (1 prop)
• libf/dyn3dmem/diverg_p.F (modified) (1 prop)
• libf/dyn3dmem/divergf.F (modified) (1 prop)
• libf/dyn3dmem/divergf_loc.F (modified) (1 prop)
• libf/dyn3dmem/divergst.F (modified) (1 prop)
• libf/dyn3dmem/divgrad.F (modified) (1 prop)
• libf/dyn3dmem/divgrad2.F (modified) (1 prop)
• libf/dyn3dmem/divgrad2_loc.F (modified) (1 prop)
• libf/dyn3dmem/divgrad2_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/dteta1_loc.F (modified) (1 prop)
• libf/dyn3dmem/dudv1_loc.F (modified) (1 prop)
• libf/dyn3dmem/dudv2_loc.F (modified) (1 prop)
• libf/dyn3dmem/dump2d.F (modified) (1 prop)
• libf/dyn3dmem/dynetat0_loc.F (modified) (1 diff, 1 prop)
• libf/dyn3dmem/dynredem_loc.F (modified) (1 prop)
• libf/dyn3dmem/dynredem_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/ener.h (modified) (1 prop)
• libf/dyn3dmem/enercin.F (modified) (1 prop)
• libf/dyn3dmem/enercin_loc.F (modified) (1 prop)
• libf/dyn3dmem/exner_hyb.F (modified) (1 prop)
• libf/dyn3dmem/exner_hyb_loc.F (modified) (1 prop)
• libf/dyn3dmem/exner_milieu.F (modified) (1 prop)
• libf/dyn3dmem/exner_milieu_loc.F (modified) (1 prop)
• libf/dyn3dmem/extrapol.F (modified) (1 prop)
• libf/dyn3dmem/filtreg_p.F (modified) (1 prop)
• libf/dyn3dmem/flumass.F (modified) (1 prop)
• libf/dyn3dmem/flumass_loc.F (modified) (1 prop)
• libf/dyn3dmem/friction_loc.F (modified) (1 prop)
• libf/dyn3dmem/fxhyp.F (modified) (1 prop)
• libf/dyn3dmem/fxy.F (modified) (1 prop)
• libf/dyn3dmem/fxyhyper.F (modified) (1 prop)
• libf/dyn3dmem/fxysinus.F (modified) (1 prop)
• libf/dyn3dmem/fyhyp.F (modified) (1 prop)
• libf/dyn3dmem/gcm.F (modified) (1 prop)
• libf/dyn3dmem/geopot.F (modified) (1 prop)
• libf/dyn3dmem/geopot_loc.F (modified) (1 prop)
• libf/dyn3dmem/getparam.F90 (modified) (1 prop)
• libf/dyn3dmem/gr_dyn_fi.F (modified) (1 prop)
• libf/dyn3dmem/gr_dyn_fi_p.F (modified) (1 prop)
• libf/dyn3dmem/gr_ecrit_fi.F (modified) (1 prop)
• libf/dyn3dmem/gr_fi_dyn.F (modified) (1 prop)
• libf/dyn3dmem/gr_fi_dyn_p.F (modified) (1 prop)
• libf/dyn3dmem/gr_int_dyn.F (modified) (1 prop)
• libf/dyn3dmem/gr_u_scal.F (modified) (1 prop)
• libf/dyn3dmem/gr_u_scal_loc.F (modified) (1 prop)
• libf/dyn3dmem/gr_v_scal.F (modified) (1 prop)
• libf/dyn3dmem/gr_v_scal_loc.F (modified) (1 prop)
• libf/dyn3dmem/grad.F (modified) (1 prop)
• libf/dyn3dmem/grad_loc.F (modified) (1 prop)
• libf/dyn3dmem/grad_p.F (modified) (1 prop)
• libf/dyn3dmem/gradiv.F (modified) (1 prop)
• libf/dyn3dmem/gradiv2.F (modified) (1 prop)
• libf/dyn3dmem/gradiv2_loc.F (modified) (1 prop)
• libf/dyn3dmem/gradiv2_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/gradsdef.h (modified) (1 prop)
• libf/dyn3dmem/grid_atob.F (modified) (1 prop)
• libf/dyn3dmem/grid_noro.F (modified) (1 prop)
• libf/dyn3dmem/grilles_gcm_netcdf.F (modified) (1 prop)
• libf/dyn3dmem/grilles_gcm_netcdf_sub.F90 (modified) (1 prop)
• libf/dyn3dmem/groupe_loc.F (modified) (1 prop)
• libf/dyn3dmem/groupe_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/groupeun_loc.F (modified) (1 prop)
• libf/dyn3dmem/guide_loc_mod.F90 (modified) (16 diffs, 1 prop)
• libf/dyn3dmem/heavyside.F (modified) (1 prop)
• libf/dyn3dmem/infotrac.F90 (modified) (1 prop)
• libf/dyn3dmem/iniacademic_loc.F90 (modified) (1 prop)
• libf/dyn3dmem/iniconst.F90 (modified) (1 prop)
• libf/dyn3dmem/inidissip.F90 (modified) (1 prop)
• libf/dyn3dmem/inigeom.F (modified) (1 prop)
• libf/dyn3dmem/inigrads.F (modified) (1 diff, 1 prop)
• libf/dyn3dmem/iniprint.h (modified) (1 prop)
• libf/dyn3dmem/initdynav_loc.F (modified) (1 prop)
• libf/dyn3dmem/initfluxsto_p.F (modified) (1 prop)
• libf/dyn3dmem/inithist_loc.F (modified) (1 prop)
• libf/dyn3dmem/initial0.F (modified) (1 prop)
• libf/dyn3dmem/integrd_loc.F (modified) (1 prop)
• libf/dyn3dmem/integrd_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/inter_barxy_m.F90 (modified) (1 prop)
• libf/dyn3dmem/interpost.F (modified) (1 prop)
• libf/dyn3dmem/interpre.F (modified) (1 prop)
• libf/dyn3dmem/invert_lat.F90 (modified) (1 prop)
• libf/dyn3dmem/juldate.F (modified) (1 prop)
• libf/dyn3dmem/laplacien.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_gam.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_gam_loc.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_loc.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_rot.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_rot_loc.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_rotgam.F (modified) (1 prop)
• libf/dyn3dmem/laplacien_rotgam_loc.F (modified) (1 prop)
• libf/dyn3dmem/leapfrog_loc.F (modified) (1 prop)
• libf/dyn3dmem/leapfrog_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/limx.F (modified) (1 prop)
• libf/dyn3dmem/limy.F (modified) (1 prop)
• libf/dyn3dmem/limz.F (modified) (1 prop)
• libf/dyn3dmem/logic.h (modified) (1 prop)
• libf/dyn3dmem/massbar.F (modified) (1 prop)
• libf/dyn3dmem/massbar_loc.F (modified) (1 prop)
• libf/dyn3dmem/massbarxy.F (modified) (1 prop)
• libf/dyn3dmem/massbarxy_loc.F (modified) (1 prop)
• libf/dyn3dmem/massdair.F (modified) (1 prop)
• libf/dyn3dmem/massdair_loc.F (modified) (1 prop)
• libf/dyn3dmem/minmax.F (modified) (1 prop)
• libf/dyn3dmem/minmax2.F (modified) (1 prop)
• libf/dyn3dmem/mod_const_mpi.F90 (modified) (3 diffs, 1 prop)
• libf/dyn3dmem/mod_filtreg_p.F (modified) (1 prop)
• libf/dyn3dmem/mod_hallo.F90 (modified) (1 prop)
• libf/dyn3dmem/mod_interface_dyn_phys.F90 (modified) (1 prop)
• libf/dyn3dmem/nxgrad.F (modified) (1 prop)
• libf/dyn3dmem/nxgrad_gam.F (modified) (1 prop)
• libf/dyn3dmem/nxgrad_gam_loc.F (modified) (1 prop)
• libf/dyn3dmem/nxgrad_loc.F (modified) (1 prop)
• libf/dyn3dmem/nxgradst.F (modified) (1 prop)
• libf/dyn3dmem/nxgraro2.F (modified) (1 prop)
• libf/dyn3dmem/nxgraro2_loc.F (modified) (1 prop)
• libf/dyn3dmem/nxgraro2_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/nxgrarot.F (modified) (1 prop)
• libf/dyn3dmem/nxgrarot_p.F (modified) (1 prop)
• libf/dyn3dmem/omp_chunk.h (modified) (1 prop)
• libf/dyn3dmem/parallel_lmdz.F90 (modified) (1 prop)
• libf/dyn3dmem/paramet.h (modified) (1 prop)
• libf/dyn3dmem/pbar.F (modified) (1 prop)
• libf/dyn3dmem/pentes_ini.F (modified) (1 prop)
• libf/dyn3dmem/ppm3d.F (modified) (1 prop)
• libf/dyn3dmem/prather.F (modified) (1 prop)
• libf/dyn3dmem/pres2lev_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/pression.F (modified) (1 prop)
• libf/dyn3dmem/pression_loc.F (modified) (1 prop)
• libf/dyn3dmem/profvert.def (modified) (1 prop)
• libf/dyn3dmem/psextbar.F (modified) (1 prop)
• libf/dyn3dmem/q_sat.F (modified) (1 prop)
• libf/dyn3dmem/qminimum_loc.F (modified) (1 prop)
• libf/dyn3dmem/ran1.F (modified) (1 prop)
• libf/dyn3dmem/rotat.F (modified) (1 prop)
• libf/dyn3dmem/rotat_nfil.F (modified) (1 prop)
• libf/dyn3dmem/rotat_nfil_loc.F (modified) (1 prop)
• libf/dyn3dmem/rotat_p.F (modified) (1 prop)
• libf/dyn3dmem/rotatf.F (modified) (1 prop)
• libf/dyn3dmem/rotatf_loc.F (modified) (1 prop)
• libf/dyn3dmem/rotatst.F (modified) (1 prop)
• libf/dyn3dmem/serre.h (modified) (1 prop)
• libf/dyn3dmem/sort.F (modified) (1 prop)
• libf/dyn3dmem/sortvarc.F (modified) (1 prop)
• libf/dyn3dmem/sortvarc0.F (modified) (1 prop)
• libf/dyn3dmem/startvar.F90 (modified) (1 prop)
• libf/dyn3dmem/sw_case_williamson91_6_loc.F (modified) (1 prop)
• libf/dyn3dmem/temps.h (modified) (1 prop)
• libf/dyn3dmem/test_period.F (modified) (1 prop)
• libf/dyn3dmem/times.F90 (modified) (1 prop)
• libf/dyn3dmem/top_bound_loc.F (modified) (1 prop)
• libf/dyn3dmem/tourabs.F (modified) (1 prop)
• libf/dyn3dmem/tourpot.F (modified) (1 prop)
• libf/dyn3dmem/tourpot_loc.F (modified) (1 prop)
• libf/dyn3dmem/traceurpole.F (modified) (1 prop)
• libf/dyn3dmem/tracstoke.h (modified) (1 prop)
• libf/dyn3dmem/ugeostr.F90 (modified) (1 prop)
• libf/dyn3dmem/vitvert.F (modified) (1 prop)
• libf/dyn3dmem/vitvert_loc.F (modified) (1 prop)
• libf/dyn3dmem/vlsplt_loc.F (modified) (1 prop)
• libf/dyn3dmem/vlspltgen_loc.F (modified) (1 prop)
• libf/dyn3dmem/vlspltgen_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/vlspltqs_loc.F (modified) (1 prop)
• libf/dyn3dmem/vlz_mod.F90 (modified) (1 prop)
• libf/dyn3dmem/wrgrads.F (modified) (1 prop)
• libf/dyn3dmem/write_field_loc.F90 (modified) (1 prop)
• libf/dyn3dmem/write_field_p.F90 (modified) (1 prop)
• libf/dyn3dmem/write_grads_dyn.h (modified) (1 prop)
• libf/dyn3dmem/writedynav_loc.F (modified) (1 prop)
• libf/dyn3dmem/writehist_loc.F (modified) (1 prop)

LMDZ5/branches/testing/libf/dyn3dmem/bilan_dyn_loc.F

@@ -420 +420 @@
           masse_cum(:,jjb:jje,l)=0.
           flux_u_cum(:,jjb:jje,l)=0.
-          Q_cum(:,jjb:jje,:,l)=0.
+          Q_cum(:,jjb:jje,l,:)=0.
           flux_uQ_cum(:,jjb:jje,l,:)=0.
           if (pole_sud) jje=jj_end-1
@@ -444 +444 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-        masse_cum(:,jjb:jje,:)=masse_cum(:,jjb:jje,:)+masse(:,jjb:jje,:)
-        flux_u_cum(:,jjb:jje,:)=flux_u_cum(:,jjb:jje,:)
-     .                         +flux_u(:,jjb:jje,:)
+        masse_cum(:,jjb:jje,l)=masse_cum(:,jjb:jje,l)+masse(:,jjb:jje,l)
+        flux_u_cum(:,jjb:jje,l)=flux_u_cum(:,jjb:jje,l)
+     .                         +flux_u(:,jjb:jje,l)
       ENDDO
 !$OMP END DO NOWAIT
@@ -454 +454 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
       DO l=1,llm
-       flux_v_cum(:,jjb:jje,:)=flux_v_cum(:,jjb:jje,:)
-     .                          +flux_v(:,jjb:jje,:)
+       flux_v_cum(:,jjb:jje,l)=flux_v_cum(:,jjb:jje,l)
+     .                          +flux_v(:,jjb:jje,l)
       ENDDO
 !$OMP END DO NOWAIT
@@ -465 +465 @@
 !$OMP DO SCHEDULE(STATIC,OMP_CHUNK)
         DO l=1,llm
-          Q_cum(:,jjb:jje,:,iQ)=Q_cum(:,jjb:jje,:,iQ)
-     .                       +Q(:,jjb:jje,:,iQ)*masse(:,jjb:jje,:)
+          Q_cum(:,jjb:jje,l,iQ)=Q_cum(:,jjb:jje,l,iQ)
+     .                       +Q(:,jjb:jje,l,iQ)*masse(:,jjb:jje,l)
         ENDDO
 !$OMP END DO NOWAIT
@@ -494 +494 @@
 c    -------------
       do iQ=1,nQ
-        call Register_Hallo_u(Q(1,1,1,iQ),llm,0,1,1,0,Req)
+        call Register_Hallo_u(Q(1,jjb_u,1,iQ),llm,0,1,1,0,Req) 
       enddo
       call SendRequest(Req)
@@ -660 +660 @@
       call Register_Hallo_u(masse_cum,llm,1,1,1,1,Req)
       do iQ=1,nQ
-        call Register_Hallo_u(Q_cum(1,1,1,iQ),llm,0,1,1,0,Req)
+        call Register_Hallo_u(Q_cum(1,jjb_u,1,iQ),llm,0,1,1,0,Req)
       enddo
 

LMDZ5/branches/testing/libf/dyn3dmem/dynetat0_loc.F

@@ -377 +377 @@
             CALL abort
           ENDIF
+        q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
+
         ENDIF
-        q(ijb_u:ije_u,:,iq)=q_glo(ijb_u:ije_u,:)
       ENDDO
 

LMDZ5/branches/testing/libf/dyn3dmem/guide_loc_mod.F90

@@ -156 +156 @@
     ncidpl=-99
     if (guide_plevs.EQ.1) then
-       if (ncidpl.eq.-99) rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
+       if (ncidpl.eq.-99) then
+          rcod=nf90_open('apbp.nc',Nf90_NOWRITe, ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier apbp.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     elseif (guide_plevs.EQ.2) then
-       if (ncidpl.EQ.-99) rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
+       if (ncidpl.EQ.-99) then
+          rcod=nf90_open('P.nc',Nf90_NOWRITe,ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier P.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     elseif (guide_u) then
-       if (ncidpl.eq.-99) rcod=nf90_open('u.nc',Nf90_NOWRITe,ncidpl)
+       if (ncidpl.eq.-99) then
+          rcod=nf90_open('u.nc',Nf90_NOWRITe,ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier u.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     elseif (guide_v) then
-       if (ncidpl.eq.-99) rcod=nf90_open('v.nc',nf90_nowrite,ncidpl)
+       if (ncidpl.eq.-99) then
+          rcod=nf90_open('v.nc',nf90_nowrite,ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier v.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     elseif (guide_T) then
-       if (ncidpl.eq.-99) rcod=nf90_open('T.nc',nf90_nowrite,ncidpl)
+       if (ncidpl.eq.-99) then
+          rcod=nf90_open('T.nc',nf90_nowrite,ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier T.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     elseif (guide_Q) then
-       if (ncidpl.eq.-99) rcod=nf90_open('hur.nc',nf90_nowrite, ncidpl)
+       if (ncidpl.eq.-99) then
+          rcod=nf90_open('hur.nc',nf90_nowrite, ncidpl)
+          if (rcod.NE.NF_NOERR) THEN
+             print *,'Guide: probleme -> pas de fichier hur.nc'
+             CALL abort_gcm(modname,abort_message,1)
+          endif
+       endif
     endif 
     error=NF_INQ_DIMID(ncidpl,'LEVEL',rid)
@@ -1542 +1578 @@
              print *,'Lecture du guidage sur niveaux modele'
              rcode = nf90_open('apbp.nc', nf90_nowrite, ncidpl)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidpl, 'AP', varidap)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable AP, fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidpl, 'BP', varidbp)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable BP, fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidpl,varidap',ncidpl,varidap
          endif
@@ -1549 +1597 @@
          if (guide_plevs.EQ.2) then
              rcode = nf90_open('P.nc', nf90_nowrite, ncidp)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier P.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidp, 'PRES', varidp)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable PRES, fichier P.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidp,varidp',ncidp,varidp
              if (ncidpl.eq.-99) ncidpl=ncidp
@@ -1556 +1612 @@
          if (guide_u) then
              rcode = nf90_open('u.nc', nf90_nowrite, ncidu)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier u.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidu, 'UWND', varidu)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable UWND, fichier u.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidu,varidu',ncidu,varidu
              if (ncidpl.eq.-99) ncidpl=ncidu
@@ -1563 +1627 @@
          if (guide_v) then
              rcode = nf90_open('v.nc', nf90_nowrite, ncidv)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier v.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidv, 'VWND', varidv)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable VWND, fichier v.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidv,varidv',ncidv,varidv
              if (ncidpl.eq.-99) ncidpl=ncidv
@@ -1570 +1642 @@
          if (guide_T) then
              rcode = nf90_open('T.nc', nf90_nowrite, ncidt)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier T.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidt, 'AIR', varidt)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable AIR, fichier T.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidT,varidT',ncidt,varidt
              if (ncidpl.eq.-99) ncidpl=ncidt
@@ -1577 +1657 @@
          if (guide_Q) then
              rcode = nf90_open('hur.nc', nf90_nowrite, ncidQ)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier hur.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidQ, 'RH', varidQ)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable RH, fichier hur.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidQ,varidQ',ncidQ,varidQ
              if (ncidpl.eq.-99) ncidpl=ncidQ
@@ -1584 +1672 @@
          if ((guide_P).OR.(guide_plevs.EQ.1)) then
              rcode = nf90_open('ps.nc', nf90_nowrite, ncidps)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier ps.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidps, 'SP', varidps)
+             IF (rcode.NE.NF_NOERR) THEN 
+              print *,'Guide: probleme -> pas de variable SP, fichier ps.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidps,varidps',ncidps,varidps
          endif
@@ -1753 +1849 @@
     INTEGER               :: i
     CHARACTER (len = 80)   :: abort_message
-    CHARACTER (len = 20)   :: modname = 'guide_read'
+    CHARACTER (len = 20)   :: modname = 'guide_read2D'
     abort_message='pb in guide_read2D'
 
@@ -1766 +1862 @@
              print *,'Lecture du guidage sur niveaux mod�le'
              rcode = nf90_open('apbp.nc', nf90_nowrite, ncidpl)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidpl, 'AP', varidap)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable AP, fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidpl, 'BP', varidbp)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable BP, fichier apbp.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidpl,varidap',ncidpl,varidap
          endif
@@ -1773 +1881 @@
          if (guide_plevs.EQ.2) then
              rcode = nf90_open('P.nc', nf90_nowrite, ncidp)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier P.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidp, 'PRES', varidp)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable PRES, fichier P.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidp,varidp',ncidp,varidp
              if (ncidpl.eq.-99) ncidpl=ncidp
@@ -1780 +1896 @@
          if (guide_u) then
              rcode = nf90_open('u.nc', nf90_nowrite, ncidu)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier u.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidu, 'UWND', varidu)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable UWND, fichier u.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidu,varidu',ncidu,varidu
              if (ncidpl.eq.-99) ncidpl=ncidu
@@ -1787 +1911 @@
          if (guide_v) then
              rcode = nf90_open('v.nc', nf90_nowrite, ncidv)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier v.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidv, 'VWND', varidv)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable VWND, fichier v.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidv,varidv',ncidv,varidv
              if (ncidpl.eq.-99) ncidpl=ncidv
@@ -1794 +1926 @@
          if (guide_T) then
              rcode = nf90_open('T.nc', nf90_nowrite, ncidt)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier T.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidt, 'AIR', varidt)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable AIR, fichier T.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidT,varidT',ncidt,varidt
              if (ncidpl.eq.-99) ncidpl=ncidt
@@ -1801 +1941 @@
          if (guide_Q) then
              rcode = nf90_open('hur.nc', nf90_nowrite, ncidQ)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier hur.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidQ, 'RH', varidQ)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable RH, fichier hur.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidQ,varidQ',ncidQ,varidQ
              if (ncidpl.eq.-99) ncidpl=ncidQ
@@ -1808 +1956 @@
          if ((guide_P).OR.(guide_plevs.EQ.1)) then
              rcode = nf90_open('ps.nc', nf90_nowrite, ncidps)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de fichier ps.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              rcode = nf90_inq_varid(ncidps, 'SP', varidps)
+             IF (rcode.NE.NF_NOERR) THEN
+              print *,'Guide: probleme -> pas de variable SP, fichier ps.nc'
+              CALL abort_gcm(modname,abort_message,1)
+             ENDIF
              print*,'ncidps,varidps',ncidps,varidps
          endif

LMDZ5/branches/testing/libf/dyn3dmem/inigrads.F

@@ -13 +13 @@
       real xmin,xmax,ymin,ymax
 
-      character file*10,titlel*40
+      character(len=*),intent(in) :: file
+      character(len=*),intent(in) :: titlel
 
 #include "gradsdef.h"

LMDZ5/branches/testing/libf/dyn3dmem/mod_const_mpi.F90

@@ -3 +3 @@
 !
 MODULE mod_const_mpi
-
+  IMPLICIT NONE
   INTEGER,SAVE :: COMM_LMDZ
   INTEGER,SAVE :: MPI_REAL_LMDZ
@@ -12 +12 @@
   SUBROUTINE Init_const_mpi
 #ifdef CPP_IOIPSL
-    USE IOIPSL
+    USE IOIPSL, ONLY: getin
 #else
 ! if not using IOIPSL, we still need to use (a local version of) getin
-    USE ioipsl_getincom
+    USE ioipsl_getincom, only: getin
 #endif
 
@@ -53 +53 @@
   SUBROUTINE Init_mpi
 #ifdef CPP_XIOS
-    USE wxios
+    USE wxios, only: wxios_init
 #endif
   IMPLICIT NONE