Changeset 2372


Ignore:
Timestamp:
Oct 13, 2015, 2:41:47 PM (9 years ago)
Author:
acozic
Message:

Change call to inca initialisation to fit with new sections dynamique/physic

Location:
LMDZ5/trunk/libf
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/libf/dyn3d/gcm.F90

    r2351 r2372  
    2424  USE mod_const_mpi, ONLY: COMM_LMDZ
    2525
    26 #ifdef INCA
    27   ! Only INCA needs these informations (from the Earth's physics)
    28   USE indice_sol_mod
    29   USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
    30 #endif
    3126
    3227!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    … …  
    8681  include "iniprint.h"
    8782  include "tracstoke.h"
    88 #ifdef INCA
    89   ! Only INCA needs these informations (from the Earth's physics)
    90   !include "indicesol.h"
    91 #endif
    9283
    9384  REAL zdtvr
    … …  
    209200#endif
    210201  !-----------------------------------------------------------------------
    211 
    212   IF (type_trac == 'inca') THEN
    213 #ifdef INCA
    214      call init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday,  &
    215           nbsrf, is_oce,is_sic,is_ter,is_lic)
    216      call init_inca_para(iim,jjm+1,klon,1,klon_mpi_para_nb,0)
    217 #endif
    218   END IF
    219202  !
    220203  !
    … …  
    260243
    261244  endif ! of if (read_start)
    262 
    263   IF (type_trac == 'inca') THEN
    264 #ifdef INCA
    265      call init_inca_dim(klon,llm,iim,jjm, &
    266           rlonu,rlatu,rlonv,rlatv)
    267 #endif
    268   END IF
    269245
    270246

  • LMDZ5/trunk/libf/dyn3d_common/infotrac.F90

    r2362 r2372  
    201201       END IF
    202202       ! nbtr has been read from INCA by init_const_lmdz() in gcm.F
     203#ifdef INCA
     204       CALL Init_chem_inca_trac(nbtr)
     205#endif       
    203206       nqtrue=nbtr+nqo
    204 !!       nqtrue=nbtr+2
    205207    END IF   ! type_trac
    206208!>jyg
    … …  
    678680
    679681    do iq=nqo+1,nqtot
    680        write(lunout,*) 'infotrac 569: iq,tnom_0(iq)=',iq,tnom_0(iq)
     682!       write(lunout,*) 'infotrac 569: iq,tnom_0(iq)=',iq,tnom_0(iq)
    681683       do phase=1,nqo   
    682684        do ixt= 1,niso_possibles   
    683685         tnom_trac=trim(tnom_0(phase))//'_'
    684686         tnom_trac=trim(tnom_trac)//trim(tnom_iso(ixt))
    685          write(*,*) 'phase,ixt,tnom_trac=',phase,ixt,tnom_trac     
     687!         write(*,*) 'phase,ixt,tnom_trac=',phase,ixt,tnom_trac     
    686688         IF (tnom_0(iq) == tnom_trac) then
    687           write(lunout,*) 'Ce traceur est un isotope'
     689!          write(lunout,*) 'Ce traceur est un isotope'
    688690          nb_iso(ixt,phase)=nb_iso(ixt,phase)+1   
    689691          nb_isoind(phase)=nb_isoind(phase)+1   
    … …  
    692694          indnum_fn_num(ixt)=iso_indnum(iq)
    693695          phase_num(iq)=phase
    694           write(lunout,*) 'iso_num(iq)=',iso_num(iq)
    695           write(lunout,*) 'iso_indnum(iq)=',iso_indnum(iq)
    696           write(lunout,*) 'indnum_fn_num(ixt)=',indnum_fn_num(ixt)
    697           write(lunout,*) 'phase_num(iq)=',phase_num(iq)
     696!          write(lunout,*) 'iso_num(iq)=',iso_num(iq)
     697!          write(lunout,*) 'iso_indnum(iq)=',iso_indnum(iq)
     698!          write(lunout,*) 'indnum_fn_num(ixt)=',indnum_fn_num(ixt)
     699!          write(lunout,*) 'phase_num(iq)=',phase_num(iq)
    698700          goto 20
    699701         else if (iqpere(iq).gt.0) then         
    700702          if (tnom_0(iqpere(iq)) == tnom_trac) then
    701            write(lunout,*) 'Ce traceur est le fils d''un isotope'
     703!           write(lunout,*) 'Ce traceur est le fils d''un isotope'
    702704           ! c'est un traceur d'isotope
    703705           nb_traciso(ixt,phase)=nb_traciso(ixt,phase)+1
    … …  
    706708           zone_num(iq)=nb_traciso(ixt,phase)
    707709           phase_num(iq)=phase
    708            write(lunout,*) 'iso_num(iq)=',iso_num(iq)
    709            write(lunout,*) 'phase_num(iq)=',phase_num(iq)
    710            write(lunout,*) 'zone_num(iq)=',zone_num(iq)
     710!           write(lunout,*) 'iso_num(iq)=',iso_num(iq)
     711!           write(lunout,*) 'phase_num(iq)=',phase_num(iq)
     712!           write(lunout,*) 'zone_num(iq)=',zone_num(iq)
    711713           goto 20
    712714          endif !if (tnom_0(iqpere(iq)) == trim(tnom_0(phase))//trim(tnom_iso(ixt))) then
    … …  
    717719      enddo !do iq=1,nqtot
    718720
    719       write(lunout,*) 'iso_num=',iso_num
    720       write(lunout,*) 'iso_indnum=',iso_indnum
    721       write(lunout,*) 'zone_num=',zone_num 
    722       write(lunout,*) 'phase_num=',phase_num
    723       write(lunout,*) 'indnum_fn_num=',indnum_fn_num
     721!      write(lunout,*) 'iso_num=',iso_num
     722!      write(lunout,*) 'iso_indnum=',iso_indnum
     723!      write(lunout,*) 'zone_num=',zone_num 
     724!      write(lunout,*) 'phase_num=',phase_num
     725!      write(lunout,*) 'indnum_fn_num=',indnum_fn_num
    724726
    725727      do ixt= 1,niso_possibles 
    … …  
    730732          do phase=2,nqo
    731733            if (nb_iso(ixt,phase).ne.nb_iso(ixt,1)) then
    732               write(lunout,*) 'ixt,phase,nb_iso=',ixt,phase,nb_iso(ixt,phase)
     734!              write(lunout,*) 'ixt,phase,nb_iso=',ixt,phase,nb_iso(ixt,phase)
    733735              CALL abort_gcm('infotrac_init','Phases must have same number of isotopes',1)
    734736            endif
    … …  
    769771    ! dimensions isotopique:
    770772    ntraciso=niso*(ntraceurs_zone+1)
    771     WRITE(lunout,*) 'niso=',niso
    772     WRITE(lunout,*) 'ntraceurs_zone,ntraciso=',ntraceurs_zone,ntraciso   
     773!    WRITE(lunout,*) 'niso=',niso
     774!    WRITE(lunout,*) 'ntraceurs_zone,ntraciso=',ntraceurs_zone,ntraciso   
    773775 
    774776    ! flags isotopiques:
    … …  
    778780        ok_isotopes=.false.
    779781    endif
    780     WRITE(lunout,*) 'ok_isotopes=',ok_isotopes
     782!    WRITE(lunout,*) 'ok_isotopes=',ok_isotopes
    781783 
    782784    if (ok_isotopes) then
    … …  
    788790        alpha_ideal=(/1.0,1.01,1.006,1.003,1.0/)
    789791    endif !if (ok_isotopes) then 
    790     WRITE(lunout,*) 'ok_iso_verif=',ok_iso_verif
    791     WRITE(lunout,*) 'ok_init_iso=',ok_init_iso
     792!    WRITE(lunout,*) 'ok_iso_verif=',ok_iso_verif
     793!    WRITE(lunout,*) 'ok_init_iso=',ok_init_iso
    792794
    793795    if (ntraceurs_zone.gt.0) then
    … …  
    796798        ok_isotrac=.false.
    797799    endif   
    798     WRITE(lunout,*) 'ok_isotrac=',ok_isotrac
     800!    WRITE(lunout,*) 'ok_isotrac=',ok_isotrac
    799801
    800802    ! remplissage du tableau iqiso(ntraciso,phase)
    … …  
    807809        endif
    808810    enddo
    809     WRITE(lunout,*) 'iqiso=',iqiso
     811!    WRITE(lunout,*) 'iqiso=',iqiso
    810812
    811813    ! replissage du tableau index_trac(ntraceurs_zone,niso)
    … …  
    820822        index_trac(:,:)=0.0
    821823    endif !if (ok_isotrac) then
    822     write(lunout,*) 'index_trac=',index_trac   
     824!    write(lunout,*) 'index_trac=',index_trac   
    823825
    824826! Finalize :

  • LMDZ5/trunk/libf/dyn3dmem/gcm.F90

    r2362 r2372  
    1717  USE filtreg_mod
    1818  USE control_mod
    19 
    20 #ifdef INCA
    21   ! Only INCA needs these informations (from the Earth's physics)
    22   USE indice_sol_mod
    23   USE mod_phys_lmdz_omp_data, ONLY: klon_omp
    24   USE mod_grid_phy_lmdz, ONLY : klon_glo
    25 #endif
    2619
    2720#ifdef CPP_PHYS
    … …  
    7467  include "tracstoke.h"
    7568
    76 #ifdef INCA
    77   ! Only INCA needs these informations (from the Earth's physics)
    78   !include "indicesol.h"
    79 #endif
    8069
    8170  REAL zdtvr
    … …  
    198187#endif
    199188
    200   IF (type_trac == 'inca') THEN
    201 #ifdef INCA
    202      call init_const_lmdz( &
    203           nbtr,anneeref,dayref, &
    204           iphysiq,day_step,nday,  &
    205           nbsrf, is_oce,is_sic, &
    206           is_ter,is_lic, calend)
    207 
    208      call init_inca_para( &
    209           iim,jjm+1,llm,klon_glo,mpi_size, &
    210           distrib_phys,COMM_LMDZ)
    211 #endif
    212   END IF
    213189
    214190  !-----------------------------------------------------------------------
    … …  
    408384
    409385  !-----------------------------------------------------------------------
    410   !   Initialisation des dimensions d'INCA :
    411   !   --------------------------------------
    412   IF (type_trac == 'inca') THEN
    413      !$OMP PARALLEL
    414 #ifdef INCA
    415      CALL init_inca_dim(klon_omp,llm,iim,jjm, &
    416           rlonu,rlatu,rlonv,rlatv)
    417 #endif
    418      !$OMP END PARALLEL
    419   END IF
    420 
    421   !-----------------------------------------------------------------------
    422386  !   Initialisation des I/O :
    423387  !   ------------------------

  • LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq_mod.F90

    r2355 r2372  
    1313  USE dimphy, ONLY: init_dimphy
    1414  USE mod_grid_phy_lmdz, ONLY: klon_glo,  & ! number of atmospheric columns (on full grid)
    15                                regular_lonlat  ! regular longitude-latitude grid type
     15                               regular_lonlat, &  ! regular longitude-latitude grid type
     16                               nbp_lon, nbp_lat, nbp_lev
    1617  USE mod_phys_lmdz_para, ONLY: klon_omp, & ! number of columns (on local omp grid)
    1718                                klon_omp_begin, & ! start index of local omp subgrid
    … …  
    3233  USE CHEM_REP, ONLY : Init_chem_rep_phys
    3334#endif
    34   USE control_mod, ONLY: dayref,anneeref,day_step,nday,offline
     35  USE control_mod, ONLY: dayref,anneeref,day_step,nday,offline, iphysiq
    3536  USE inifis_mod, ONLY: inifis
    3637  USE time_phylmdz_mod, ONLY: init_time
    … …  
    4445                                 south_west, south_east
    4546  USE mod_interface_dyn_phys, ONLY :  init_interface_dyn_phys
     47#ifdef INCA
     48  USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
     49  USE parallel_lmdz, ONLY : mpi_size
     50  USE mod_const_mpi, ONLY : COMM_LMDZ
     51  USE bands, ONLY : distrib_phys
     52  USE mod_phys_lmdz_omp_data, ONLY: klon_omp
     53#endif
    4654  IMPLICIT NONE
    4755
    … …  
    282290#endif
    283291  ENDIF
     292!$OMP END PARALLEL
     293
     294  IF (type_trac == 'inca') THEN
     295#ifdef INCA
     296     call init_const_lmdz( &
     297          anneeref,dayref, &
     298          iphysiq,day_step,nday,  &
     299          nbsrf, is_oce,is_sic, &
     300          is_ter,is_lic, calend)
     301     call init_inca_para( &
     302          nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
     303          distrib_phys,COMM_LMDZ)
     304#endif
     305  END IF
     306!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
    284307
    285308  ! Additional initializations for aquaplanets
    … …  
    287310    CALL iniaqua(klon_omp,iflag_phys)
    288311  END IF
     312
     313  IF (type_trac == 'inca') THEN
     314#ifdef INCA
     315     CALL init_inca_dim(klon_omp,nbp_lev,nbp_lon,nbp_lat - 1, &
     316          rlonu,rlatu,rlonv,rlatv)
     317#endif
     318  END IF
     319
    289320!$OMP END PARALLEL
    290321

  • LMDZ5/trunk/libf/phylmd/physiq.F90

    r2369 r2372  
    10601060        piz_aero(:,:,:,:) = 0.
    10611061        cg_aero(:,:,:,:) = 0.
     1062
     1063        config_inca='none' ! default
     1064        CALL getin_p('config_inca',config_inca)
     1065
    10621066     END IF
    10631067

  • LMDZ5/trunk/libf/phylmd/tracinca_mod.F90

    r2363 r2372  
    3030    aerosol(:) = .FALSE.
    3131
    32     config_inca='none' ! default
    33     CALL getin_p('config_inca',config_inca)
    34        
    3532  END SUBROUTINE tracinca_init
    3633
Note: See TracChangeset for help on using the changeset viewer.