Changeset 4172 for LMDZ6


Ignore:
Timestamp:
Jun 17, 2022, 5:49:22 PM (2 years ago)
Author:
dcugnet
Message:
  • add the computation of nqINCA in the "tracer.def" case (A. Cozic)
  • few fixes
Location:
LMDZ6/trunk/libf
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • LMDZ6/trunk/libf/dyn3d_common/infotrac.F90

    r4170 r4172  
    288288      nbtr   = nqtrue-COUNT(delPhase(tracers(:)%gen0Name) == 'H2O' &
    289289                               .AND. tracers(:)%component == 'lmdz') !--- Number of tracers passed to phytrac
     290#ifdef INCA
     291      nqINCA = COUNT(tracers(:)%component == 'inca')
     292#endif
    290293      lerr = getKey('hadv', hadv, ky=tracers(:)%keys)
    291294      lerr = getKey('vadv', vadv, ky=tracers(:)%keys)
  • LMDZ6/trunk/libf/dyn3dmem/dynredem_loc.F90

    r4170 r4172  
    1515                    NF90_64BIT_OFFSET
    1616  USE dynredem_mod, ONLY: cre_var, put_var, err, modname, fil
    17   USE comvert_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt,pa,preff, &
    18                          nivsig,nivsigs
     17  USE comvert_mod,  ONLY: ap, bp, presnivs, pa, preff, nivsig, nivsigs,&
     18                          aps,bps,pseudoalt
    1919  USE comconst_mod, ONLY: cpp, daysec, dtvr, g, kappa, omeg, rad
    2020  USE logic_mod, ONLY: fxyhypb, ysinus
     
    3737!===============================================================================
    3838! Local variables:
    39   INTEGER :: iq, l
     39  INTEGER :: iq
    4040  INTEGER, PARAMETER :: length=100
    4141  REAL    :: tab_cntrl(length)                     !--- RUN PARAMETERS TABLE
     
    4545  INTEGER :: indexID
    4646  INTEGER :: rlonuID, rlonvID, rlatuID, rlatvID
    47   INTEGER :: sID, sigID, nID, vID, timID
     47  INTEGER :: sID, sigID, nID, timID
    4848  INTEGER :: yyears0, jjour0, mmois0
    49   REAL    :: zan0, zjulian, hours
     49  REAL    :: zjulian, hours
    5050!===============================================================================
    5151  modname='dynredem0'; fil=fichnom
     
    145145
    146146!--- Define fields saved later
    147   WRITE(unites,"('days since ',i4,'-',i2.2,'-',i2.2,' 00:00:00')"),&
     147  WRITE(unites,"('days since ',i4,'-',i2.2,'-',i2.2,' 00:00:00')") &
    148148               yyears0,mmois0,jjour0
    149149  CALL cre_var(nid,"temps","Temps de simulation",[timID],unites)
     
    202202!===============================================================================
    203203! Local variables:
    204   INTEGER :: l, iq, nid, vID, ierr, nid_trac, vID_trac
     204  INTEGER :: iq, nid, vID, ierr, nid_trac, vID_trac
    205205  INTEGER, SAVE :: nb=0
    206206  INTEGER, PARAMETER :: length=100
     
    213213  IF(mpi_rank==0) THEN !++++++++++++++++++++++++++++++++++++++++++++++++++++++++
    214214  modname='dynredem1_loc'; fil=fichnom
    215   fil=fichnom
    216215  CALL err(NF90_OPEN(fil,NF90_WRITE,nid),"open",fil)
    217216
  • LMDZ6/trunk/libf/dyn3dmem/leapfrog_loc.F

    r4170 r4172  
    15191519
    15201520#ifdef INCA
    1521          if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then
    1522             call finalize_inca
    1523          endif
     1521         if (ANY(types_trac == 'inca') .OR. &
     1522     &       ANY(types_trac == 'inco')) CALL finalize_inca
    15241523#endif
    15251524#ifdef REPROBUS
    1526          if (ANY(types_trac == 'repr')) then
    1527          call finalize_reprobus
    1528          endif
     1525         if (ANY(types_trac == 'repr')) CALL finalize_reprobus
    15291526#endif
    15301527
     
    15721569
    15731570#ifdef INCA
    1574               if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then
    1575                  call finalize_inca
    1576               endif
     1571              if (ANY(types_trac == 'inca') .OR. &
     1572     &            ANY(types_trac == 'inco')) CALL finalize_inca
    15771573#endif
    15781574#ifdef REPROBUS
    1579               if (ANY(types_trac == 'repr')) then
    1580          call finalize_reprobus
    1581               endif
     1575              if (ANY(types_trac == 'repr')) CALL finalize_reprobus
    15821576#endif
    15831577
     
    17431737
    17441738#ifdef INCA
    1745                  if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then
    1746                     call finalize_inca
    1747                  endif
     1739                 if (ANY(types_trac == 'inca') .OR. &
     1740     &               ANY(types_trac == 'inco')) CALL finalize_inca
    17481741#endif
    17491742#ifdef REPROBUS
    1750                  if (ANY(types_trac == 'repr')) then
    1751          call finalize_reprobus
    1752                  endif
     1743                 if (ANY(types_trac == 'repr')) CALL finalize_reprobus
    17531744#endif
    17541745
     
    18541845
    18551846#ifdef INCA
    1856       if (ANY(types_trac == 'inca') .OR. ANY(types_trac == 'inco')) then
    1857          call finalize_inca
    1858       endif
     1847      if (ANY(types_trac == 'inca') .OR. &
     1848     &    ANY(types_trac == 'inco')) CALL finalize_inca
    18591849#endif
    18601850#ifdef REPROBUS
    1861       if (ANY(types_trac == 'repr')) then
    1862          call finalize_reprobus
    1863       endif
     1851      if (ANY(types_trac == 'repr')) CALL finalize_reprobus
    18641852#endif
    18651853
  • LMDZ6/trunk/libf/phy_common/physics_distribution_mod.F90

    r4170 r4172  
    3737#endif
    3838
     39#ifdef REPROBUS
    3940! Initialization of Reprobus
    40     IF (ANY(types_trac == 'repr')) THEN
    41 #ifdef REPROBUS
    42        CALL Init_chem_rep_phys(klon_omp,nbp_lev)
     41    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
     42    END IF
    4343#endif
    44     END IF
    4544
    4645!$OMP END PARALLEL
     
    7170!    CALL Init_dimphy(klon_omp,nbp_lev)
    7271!
     72!#ifdef REPROBUS
    7373!! Initialization of Reprobus
    74 !    IF (ANY(types_trac == 'repr')) THEN
    75 !#ifdef REPROBUS
    76 !       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
     74!    IF (ANY(types_trac == 'repr')) CALL Init_chem_rep_phys(klon_omp,nbp_lev)
     75!    END IF
    7776!#endif
    78 !    END IF
    7977!
    8078!!$OMP END PARALLEL
  • LMDZ6/trunk/libf/phylmd/infotrac_phy.F90

    r4170 r4172  
    106106   CHARACTER(LEN=maxlen),   SAVE :: type_trac                   !--- Keyword for tracers type
    107107   CHARACTER(LEN=maxlen),   SAVE, ALLOCATABLE :: types_trac(:)  !--- Keyword for tracers type
    108 
    109108!$OMP THREADPRIVATE(nqtot, nbtr, nqo, nbIso, nqtottr, nqCO2, type_trac, types_trac)
    110109
Note: See TracChangeset for help on using the changeset viewer.