Changeset 2408 for LMDZ5/branches/testing/libf/phylmd/phys_output_mod.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_output_mod.F90 (modified) (13 diffs)

LMDZ5/branches/testing/libf/phylmd/phys_output_mod.F90

@@ -36 +36 @@
     USE iophy 
     USE dimphy
-    USE infotrac
+    USE infotrac_phy, ONLY: nqtot, nqo, niadv, tname, ttext
     USE ioipsl
-    USE phys_cal_mod, only : hour
+    USE phys_cal_mod, only : hour, calend
     USE mod_phys_lmdz_para
     USE aero_mod, only : naero_spc,name_aero
@@ -44 +44 @@
     USE surface_data, ONLY : ok_snow
     USE phys_output_ctrlout_mod
-    USE mod_grid_phy_lmdz, only: klon_glo
-
+    USE mod_grid_phy_lmdz, only: klon_glo,nbp_lon,nbp_lat
+    USE print_control_mod, ONLY: prt_level,lunout
+    USE vertical_layers_mod, ONLY: ap,bp,preff,presnivs
+    USE time_phylmdz_mod, ONLY: day_ini, itau_phy, start_time, annee_ref, day_ref
 #ifdef CPP_XIOS
     ! ug Pour les sorties XIOS
@@ -52 +54 @@
 
     IMPLICIT NONE
-    include "dimensions.h"
-    include "temps.h"
     include "clesphys.h"
     include "thermcell.h"
-    include "comvert.h"
-    include "iniprint.h"
 
     ! ug Nouveaux arguments n\'ecessaires au histwrite_mod:
@@ -69 +67 @@
     REAL, DIMENSION(klon, klev+1), INTENT(IN)   :: paprs
     REAL, DIMENSION(klon,klev,nqtot), INTENT(IN):: qx, d_qx
-    REAL, DIMENSION(klon, llm), INTENT(IN)      :: zmasse
+    REAL, DIMENSION(klon, klev), INTENT(IN)      :: zmasse
 
 
@@ -106 +104 @@
     CHARACTER(LEN=2)                      :: bb3
     CHARACTER(LEN=6)                      :: type_ocean
-    INTEGER, DIMENSION(iim*jjmp1)         ::  ndex2d
-    INTEGER, DIMENSION(iim*jjmp1*klev)    :: ndex3d
+    INTEGER, DIMENSION(nbp_lon*jjmp1)         ::  ndex2d
+    INTEGER, DIMENSION(nbp_lon*jjmp1*klev)    :: ndex3d
     INTEGER                               :: imin_ins, imax_ins
     INTEGER                               :: jmin_ins, jmax_ins
@@ -290 +288 @@
     WRITE(lunout,*)'Alt approx des couches pour une haut d echelle de 8km = ',Alt(1:klev)
     !          endif
+
+  ecrit_files(7) = ecrit_files(1)
+  ecrit_files(8) = ecrit_files(2)
+  ecrit_files(9) = ecrit_files(3)
+
   DO iff=1,nfiles
 
@@ -343 +346 @@
           IF (phys_out_regfkey(iff)) then
              imin_ins=1
-             imax_ins=iim
+             imax_ins=nbp_lon
              jmin_ins=1
              jmax_ins=jjmp1
 
              ! correction abderr        
-             do i=1,iim
+             do i=1,nbp_lon
                 WRITE(lunout,*)'io_lon(i)=',io_lon(i)
                 IF (io_lon(i).le.phys_out_lonmin(iff)) imin_ins=i
@@ -367 +370 @@
                   io_lat(jmax_ins),io_lat(jmin_ins)
 
-             CALL histbeg(phys_out_filenames(iff),iim,io_lon,jjmp1,io_lat, &
+             CALL histbeg(phys_out_filenames(iff),nbp_lon,io_lon,jjmp1,io_lat, &
                   imin_ins,imax_ins-imin_ins+1, &
                   jmin_ins,jmax_ins-jmin_ins+1, &
@@ -418 +421 @@
             DO iq=nqo+1,nqtot 
             iiq=niadv(iq)
-            o_trac(iq-nqo) = ctrl_out((/ 4, 5, 1, 1, 1, 10, 11, 11, 11 /), &
+            o_trac(iq-nqo) = ctrl_out((/ 4, 5, 5, 5, 10, 10, 11, 11, 11 /), &
                            tname(iiq),'Tracer '//ttext(iiq), "-",  &
                            (/ '', '', '', '', '', '', '', '', '' /))
@@ -523 +526 @@
     use ioipsl
     USE phys_cal_mod
+    USE time_phylmdz_mod, ONLY: day_ref, annee_ref
+    USE print_control_mod, ONLY: lunout
 
     IMPLICIT NONE
@@ -531 +536 @@
     real                :: ttt,xxx,timestep,dayseconde,dtime
     parameter (dayseconde=86400.)
-    include "temps.h"
-    include "comconst.h"
-    include "iniprint.h"
 
     ipos=scan(str,'0123456789.',.TRUE.)
@@ -540 +542 @@
     WRITE(lunout,*) "ipos = ", ipos
     WRITE(lunout,*) "il = ", il
-    if (ipos == 0) call abort_gcm("convers_timesteps", "bad str", 1)
+    if (ipos == 0) call abort_physic("convers_timesteps", "bad str", 1)
     read(str(1:ipos),*) ttt
     WRITE(lunout,*)ttt
@@ -568 +570 @@
 END MODULE phys_output_mod
 
+