Ignore:
Timestamp:
Dec 17, 2019, 3:44:15 PM (5 years ago)
Author:
lguez
Message:

Sync latest trunk changes to branch Ocean_skin

Location:
LMDZ6/branches/Ocean_skin
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/branches/Ocean_skin

  • LMDZ6/branches/Ocean_skin/DefLists/output.def

    r3605 r3617  
    22phys_out_filelevels__00001 =            1
    33
    4 phys_out_filekeys__00002 = TRUE
     4phys_out_filekeys__00002 = FALSE
    55phys_out_levmax__00002 = 42
    66phys_out_filenames__00002 = histday_ave
    7 phys_out_filelevels__00002 =  2
     7phys_out_filelevels__00002 =  6
    88
    99flag_t2m_max__00002 =            10
    … …  
    3434 flag_z0h_oce__00002 =            2
    3535
    36 phys_out_filekeys__00003 = FALSE
     36phys_out_filekeys__00003 = n
    3737phys_out_levmax__00003 = 42
    3838phys_out_filetimesteps__00003 = 1hours
    … …  
    7272
    7373phys_out_levmax__00004 = 42
    74 phys_out_filekeys__00004 = FALSE
     74phys_out_filekeys__00004 = n
    7575phys_out_filetimesteps__00004 = 1hours
    7676phys_out_filenames__00004 = histhf_ins
    77 phys_out_filelevels__00004 = 1
     77phys_out_filelevels__00004 = 2
    7878
    7979flag_u10m_oce__00004 = 1
    … …  
    100100
    101101phys_out_levmax__00005 = 42
    102 phys_out_filekeys__00005 = TRUE
     102phys_out_filekeys__00005 = n
    103103phys_out_filetypes__00005 = t_max(X)
    104104phys_out_filetimesteps__00005 = 1days
    … …  
    113113
    114114phys_out_levmax__00006 = 42
    115 phys_out_filekeys__00006 = TRUE
     115phys_out_filekeys__00006 = n
    116116phys_out_filenames__00006 = histday_min
    117117phys_out_filetypes__00006 = t_min(X)

  • LMDZ6/branches/Ocean_skin/DefLists/physiq.def_NPv6.1

    r3605 r3617  
    558558cdnc_min=10.
    559559flag_ocean_skin=3
    560 activate_ocean_skin = 2
     560activate_ocean_skin = 1

  • LMDZ6/branches/Ocean_skin/DefLists/run.def

    r3605 r3617  
    99## Type de calendrier utilise
    1010## valeur possible: earth_360d (defaut), earth_365d, earth_366d
    11 calend= gregorian
     11calend= earth_365d
    1212## Jour de l etat initial ( = 350  si 20 Decembre ,par expl. ,comme ici )
    13 dayref= 32
     13dayref= 1
    1414##  Annee de l etat  initial (   avec  4  chiffres   )
    15 anneeref= 1989
     15anneeref= 1979
    1616## Nombre de jours d integration
    17 nday= 31
     17nday= 28
    1818## Remise a zero de la date initiale
    19 raz_date= 1
     19raz_date= 0
    2020## periode de sortie des variables de controle (en pas)
    2121iconser=240

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.env

    r3605 r3617  
    11module purge
    2 module load intel-compilers/19.0.4
    3 module load intel-mpi/19.0.4
    4 module load intel-mkl/19.0.4
    5 module load hdf5/1.10.5/intel-19.0.4-mpi
    6 module load netcdf/4.7.0/intel-19.0.4-mpi
    7 module load netcdf-fortran/4.4.5/intel-19.0.4-mpi
     2module load intel-all/19.0.4
     3module load hdf5/1.10.5-mpi
     4module load netcdf/4.7.2-mpi
     5module load netcdf-fortran/4.5.2-mpi
    86
     7module load gcc/6.5.0
     8module load idrmem/1.4-mpi

  • LMDZ6/branches/Ocean_skin/arch/arch-X64_JEANZAY.fcm

    r3605 r3617  
    1414%OMP_FFLAGS          -qopenmp
    1515%BASE_LD             -i4 -r8 -auto -lmkl_intel_lp64 -lmkl_core -lmkl_sequential -lpthread
    16 %MPI_LD
     16%MPI_LD              -lidrmem
    1717%OMP_LD              -qopenmp

  • LMDZ6/branches/Ocean_skin/libf/misc/handle_err_m.F90

    r3605 r3617  
    2727
    2828    if (ncerr /= nf90_noerr) then
     29       print *, "NetCDF95 handle_err:"
    2930       print *, message, ":"
    3031       if (present(varid)) print *, "varid = ", varid
    … …  
    3940          end if
    4041       end if
    41        call abort_physic("NetCDF95 handle_err", "", 1)
     42       call abort_physic("NetCDF95 handle_err", "see above", 1)
    4243    end if
    4344

  • LMDZ6/branches/Ocean_skin/libf/phylmd/cv3_routines.F90

    r3605 r3617  
    14951495!!!!            qcld(i,k) = min(clw(i,k), elacrit)                                          !!jygprl
    14961496            qcld(i,k) = min(clw(i,k), elacrit*(1.-qta(i,k-1))/(1.-elacrit))             !!jygprl
    1497             phinu2p = qhsat(i,k-1) + qcld(i,k-1) - (qhsat(i,k) + qcld(i,k))                     !!jygprl
     1497            phinu2p = max(qhsat(i,k-1) + qcld(i,k-1) - (qhsat(i,k) + qcld(i,k)),0.)   !!jygprl
    14981498            qpl(i,k) = qpl(i,k-1) + (1.-frac(i,k))*phinu2p                            !!jygprl
    14991499            qps(i,k) = qps(i,k-1) + frac(i,k)     *phinu2p                            !!jygprl

  • LMDZ6/branches/Ocean_skin/libf/phylmd/physiq_mod.F90

    r3605 r3617  
    37283728            u, &
    37293729            v, &
     3730            rot, &
    37303731            wo(:, :, 1), &
    37313732            q_seri, &
    37323733            zxtsol, &
     3734            zt2m, &
    37333735            zxsnow_dummy, &
    37343736            solsw, &
Note: See TracChangeset for help on using the changeset viewer.