Changeset 1229

Timestamp:

Aug 17, 2009, 5:11:37 PM (15 years ago)

Author:

idelkadi

Message:

 

Location:

LMDZ4/branches/LMDZ4-dev

Files:

• libf/phylmd/clesphys.h (modified) (2 diffs)
• libf/phylmd/conf_phys.F90 (modified) (4 diffs)
• libf/phylmd/phys_output_mod.F90 (modified) (8 diffs)
• libf/phylmd/physiq.F (modified) (1 diff)
• makegcm (modified) (1 diff)

LMDZ4/branches/LMDZ4-dev/libf/phylmd/clesphys.h

@@ -44 +44 @@
 !IM lev_histmth : niveau sorties mensuelles
        INTEGER lev_histhf, lev_histday, lev_histmth
+       Integer lev_histins, lev_histLES  
        CHARACTER(len=4) type_run
 ! aer_type: pour utiliser un fichier constant dans readaerosol 
@@ -65 +66 @@
      &     , f_cdrag_ter,f_cdrag_oce,f_rugoro                           &
      &     , lev_histhf, lev_histday, lev_histmth                       &
+     &     , lev_histins, lev_histLES                                   &
      &     , type_run, ok_isccp, ok_regdyn                              &
      &     , lonmin_ins, lonmax_ins, latmin_ins, latmax_ins             &

LMDZ4/branches/LMDZ4-dev/libf/phylmd/conf_phys.F90

@@ -130 +130 @@
   REAL, SAVE ::  fmagic_omp, pmagic_omp
   INTEGER,SAVE :: iflag_pbl_omp,lev_histhf_omp,lev_histday_omp,lev_histmth_omp
+  Integer,save :: lev_histins_omp, lev_histLES_omp 
   CHARACTER*4, SAVE :: type_run_omp
   LOGICAL,SAVE :: ok_isccp_omp
@@ -1012 +1013 @@
   lev_histmth_omp = 2
   call getin('lev_histmth',lev_histmth_omp)
-
+!
+!Config Key  = lev_histins
+!Config Desc =
+!Config Def  = 1
+!Config Help =
+!
+  lev_histins_omp = 1
+  call getin('lev_histins',lev_histins_omp)
+  !
+!Config Key  = lev_histLES
+!Config Desc =
+!Config Def  = 1
+!Config Help =
+!
+  lev_histLES_omp = 1
+  call getin('lev_histLES',lev_histLES_omp)
   !
 !Config Key  = type_run
@@ -1335 +1351 @@
     lev_histday = lev_histday_omp
     lev_histmth = lev_histmth_omp
+    lev_histins = lev_histins_omp
+    lev_histLES = lev_histLES_omp
 
     type_ocean = type_ocean_omp
@@ -1504 +1522 @@
   write(numout,*)' lev_histday = ',lev_histday 
   write(numout,*)' lev_histmth = ',lev_histmth 
+  write(numout,*)' lev_histins = ',lev_histins
+  write(numout,*)' lev_histLES = ',lev_histLES
   write(numout,*)' iflag_pbl = ', iflag_pbl
   write(numout,*)' iflag_thermals = ', iflag_thermals

LMDZ4/branches/LMDZ4-dev/libf/phylmd/phys_output_mod.F90

@@ -488 +488 @@
   CHARACTER(len=3)                      :: ctetaSTD(nbteta)
   real, dimension(nfiles)               :: ecrit_files
-  CHARACTER(len=20), dimension(nfiles)  :: name_files
+  CHARACTER(len=20), dimension(nfiles)  :: phys_out_filenames
   INTEGER, dimension(iim*jjmp1)         ::  ndex2d
   INTEGER, dimension(iim*jjmp1*klev)    :: ndex3d
   integer                               :: imin_ins, imax_ins
   integer                               :: jmin_ins, jmax_ins
-  CHARACTER(len=20), dimension(nfiles)  :: type_ecri_files
+  integer, dimension(nfiles)            :: phys_out_levmin, phys_out_levmax
+  integer, dimension(nfiles)            :: phys_out_filelevels
+  CHARACTER(len=20), dimension(nfiles)  :: type_ecri_files, phys_out_filetypes
   character(len=20), dimension(nfiles)  :: chtimestep   = (/ 'DefFreq', 'DefFreq','DefFreq', 'DefFreq', 'DefFreq' /)
+  logical, dimension(nfiles)            :: phys_out_filekeys
 
 !!!!!!!!!! stockage dans une region limitee pour chaque fichier !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!                 entre [lonmin_reg,lonmax_reg] et [latmin_reg,latmax_reg]
-
-  logical, dimension(nfiles), save  :: ok_reglim         = (/ .false., .false., .false., .false., .true. /)
-  real, dimension(nfiles), save     :: lonmin_reg        = (/ 0., -45., 0., 0., -162. /)
-  real, dimension(nfiles), save     :: lonmax_reg        = (/ 90., 45., 90., 90., -144. /)
-  real, dimension(nfiles), save     :: latmin_reg        = (/ 0., -45., 0., 0., 7. /)
-  real, dimension(nfiles), save     :: latmax_reg        = (/ 90., 90., 90., 90., 21. /)
+!                 entre [phys_out_lonmin,phys_out_lonmax] et [phys_out_latmin,phys_out_latmax]
+
+  logical, dimension(nfiles), save  :: phys_out_regfkey       = (/ .false., .false., .false., .false., .false. /)
+  real, dimension(nfiles), save     :: phys_out_lonmin        = (/ -180., -180., -180., -180., -180. /)
+  real, dimension(nfiles), save     :: phys_out_lonmax        = (/ 180., 180., 180., 180., 180. /)
+  real, dimension(nfiles), save     :: phys_out_latmin        = (/ -90., -90., -90., -90., -90. /)
+  real, dimension(nfiles), save     :: phys_out_latmax        = (/ 90., 90., 90., 90., 90. /)
+  
+  
 
 ! 
@@ -510 +515 @@
    levmax = (/ klev, klev, klev, klev, klev /)
 
-   name_files(1) = 'histmth'
-   name_files(2) = 'histday'
-   name_files(3) = 'histhf'
-   name_files(4) = 'histins'
-   name_files(5) = 'histLES'
+   phys_out_filenames(1) = 'histmth'
+   phys_out_filenames(2) = 'histday'
+   phys_out_filenames(3) = 'histhf'
+   phys_out_filenames(4) = 'histins'
+   phys_out_filenames(5) = 'histLES'
 
    type_ecri(1) = 'ave(X)'
@@ -531 +536 @@
    lev_files(2) = lev_histday
    lev_files(3) = lev_histhf
-   lev_files(4) = 1
-   lev_files(5) = 1
+   lev_files(4) = lev_histins
+   lev_files(5) = lev_histLES
 
 
@@ -543 +548 @@
 !! Lectures des parametres de sorties dans physiq.def
 
-   call getin('phys_out_regfkey',ok_reglim)
-   call getin('phys_out_lonmin',lonmin_reg)
-   call getin('phys_out_lonmax',lonmax_reg)
-   call getin('phys_out_latmin',latmin_reg)
-   call getin('phys_out_latmax',latmax_reg)
+   call getin('phys_out_regfkey',phys_out_regfkey)
+   call getin('phys_out_lonmin',phys_out_lonmin)
+   call getin('phys_out_lonmax',phys_out_lonmax)
+   call getin('phys_out_latmin',phys_out_latmin)
+   call getin('phys_out_latmax',phys_out_latmax)
+     phys_out_levmin(:)=levmin(:)
    call getin('phys_out_levmin',levmin)
+     phys_out_levmax(:)=levmax(:)
    call getin('phys_out_levmax',levmax)
-   call getin('phys_out_filenames',name_files)
+   call getin('phys_out_filenames',phys_out_filenames)
+     phys_out_filekeys(:)=clef_files(:)
    call getin('phys_out_filekeys',clef_files)
+     phys_out_filelevels(:)=lev_files(:)
    call getin('phys_out_filelevels',lev_files)
    call getin('phys_out_filetimesteps',chtimestep)
-   call getin('phys_out_filetypes',type_ecri_files)
+     phys_out_filetypes(:)=type_ecri(:)
+   call getin('phys_out_filetypes',type_ecri)
 
    type_ecri_files(:)=type_ecri(:)
 
-   print*,'phys_out_lonmin=',lonmin_reg
-   print*,'phys_out_lonmax=',lonmax_reg
-   print*,'phys_out_latmin=',latmin_reg
-   print*,'phys_out_latmax=',latmax_reg
-   print*,'phys_out_filenames=',name_files
+   print*,'phys_out_lonmin=',phys_out_lonmin
+   print*,'phys_out_lonmax=',phys_out_lonmax
+   print*,'phys_out_latmin=',phys_out_latmin
+   print*,'phys_out_latmax=',phys_out_latmax
+   print*,'phys_out_filenames=',phys_out_filenames
    print*,'phys_out_filetypes=',type_ecri
    print*,'phys_out_filekeys=',clef_files
@@ -604 +614 @@
 !!!!!!!!!!!!!!!!! Traitement dans le cas ou l'on veut stocker sur un domaine limite !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-     if (ok_reglim(iff)) then
+     if (phys_out_regfkey(iff)) then
 
         imin_ins=1
@@ -614 +624 @@
         do i=1,iim
            print*,'io_lon(i)=',io_lon(i)
-           if (io_lon(i).le.lonmin_reg(iff)) imin_ins=i
-           if (io_lon(i).le.lonmax_reg(iff)) imax_ins=i+1
+           if (io_lon(i).le.phys_out_lonmin(iff)) imin_ins=i
+           if (io_lon(i).le.phys_out_lonmax(iff)) imax_ins=i+1
         enddo
 
         do j=1,jjmp1
             print*,'io_lat(j)=',io_lat(j)
-            if (io_lat(j).ge.latmin_reg(iff)) jmax_ins=j+1
-            if (io_lat(j).ge.latmax_reg(iff)) jmin_ins=j
+            if (io_lat(j).ge.phys_out_latmin(iff)) jmax_ins=j+1
+            if (io_lat(j).ge.phys_out_latmax(iff)) jmin_ins=j
         enddo
 
@@ -631 +641 @@
          io_lat(jmax_ins),io_lat(jmin_ins)
 
- CALL histbeg(name_files(iff),iim,io_lon,jjmp1,io_lat, &
+ CALL histbeg(phys_out_filenames(iff),iim,io_lon,jjmp1,io_lat, &
               imin_ins,imax_ins-imin_ins+1, &
               jmin_ins,jmax_ins-jmin_ins+1, &
@@ -637 +647 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
        else
- CALL histbeg_phy(name_files(iff),itau_phy,zjulian,dtime,nhorim(iff),nid_files(iff))
+ CALL histbeg_phy(phys_out_filenames(iff),itau_phy,zjulian,dtime,nhorim(iff),nid_files(iff))
        endif
  

LMDZ4/branches/LMDZ4-dev/libf/phylmd/physiq.F

@@ -3239 +3239 @@
 C     est egale a la variation de la physique au pas de temps precedent.
 C     Donc la somme de ces 2 variations devrait etre nulle.
+
         call diagphy(airephy,ztit,ip_ebil_phy
      e      , topsw, toplw, solsw, sollw, sens

LMDZ4/branches/LMDZ4-dev/makegcm

@@ -552 +552 @@
 if ( "$veget" == 'true' ) then
    set cppflags="$cppflags -DCPP_VEGET"
-   set link_veget=" -lsechiba -lparameters -lstomate -lorglob -lparallel"
+#   set link_veget=" -lsechiba -lparameters -lstomate -lorglob -lparallel"
+   set link_veget=" -lsechiba -lparameters -lstomate"
    if ( $XNEC || $X8BRODIE || $X6NEC) then
-      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxorglob -lsxparallel"
+#      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate -lsxorglob -lsxparallel"
+      set link_veget=" -lsxsechiba -lsxparameters -lsxstomate "
    endif
 endif