Changeset 3725


Ignore:
Timestamp:
Apr 15, 2025, 9:34:31 AM (3 months ago)
Author:
emillour
Message:

Generic PCM:
Change the way the rate of outputs for diagfi.nc files is specified:
IMPORTANT: Specifying "ecritphy" no longer possible and will trigger an error.
Use "diagfi_output_rate" to specify output rate (in physics steps) instead.
This should makes things (hopefully) clearer for users and also better
enforces a cleaner and clearer separation between dynamics and physics.
EM

Location:
trunk/LMDZ.GENERIC
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.GENERIC/changelog.txt

    r3723 r3725  
    20632063== 14/04/2025 == EM+MT
    20642064Change default CO2 ice aerosol properties file from old "optprop_co2_vis_ff.dat"
    2065 to "optprop_co2ice_vis_n50.dat". Kee possibility for now to still used old file
     2065to "optprop_co2ice_vis_n50.dat". Keep possibility for now to still used old file
    20662066by seting "forgetit=.true." in suaer_corrk.F90
    20672067
     2068== 15/04/2025 == EM
     2069Change the way the rate of outputs for diagfi.nc files is specified:
     2070IMPORTANT: Specifying "ecritphy" no longer possible and will trigger an error.
     2071Use "diagfi_output_rate" to specify output rate (in physics steps) instead.
     2072This should makes things (hopefully) clearer for users and also better
     2073enforces a cleaner and clearer separation between dynamics and physics.

  • trunk/LMDZ.GENERIC/deftank/callphys.GJ581d

    r2972 r3725  
    33# Run with or without tracer transport ?
    44tracer    = .true.
     5# rate of outputs for diagfi files (in physics steps, default: 24)
     6diagfi_output_rate = 24
    57# Diurnal cycle ?  if diurnal=false, diurnally averaged solar heating
    68diurnal   = .false.

  • trunk/LMDZ.GENERIC/deftank/callphys.earlymars

    r2972 r3725  
    33# Run with or without tracer transport ?
    44tracer    = .true.
     5# rate of outputs for diagfi files (in physics steps, default: 24)
     6diagfi_output_rate = 6
    57# Diurnal cycle ?  if diurnal=false, diurnally averaged solar heating
    68diurnal   = .true.

  • trunk/LMDZ.GENERIC/deftank/callphys.earthslab

    r3100 r3725  
    33# Run with or without tracer transport ?
    44tracer    = .true.
     5# rate of outputs for diagfi files (in physics steps, default: 24)
     6diagfi_output_rate = 6
    57# Diurnal cycle ?  if diurnal=false, diurnally averaged solar heating
    68diurnal   = .true.

  • trunk/LMDZ.GENERIC/deftank/earth1d.rcm1d.def

    r3220 r3725  
    3535ndt            = 1300
    3636# Number of steps between each writting in diagfi
    37 ecritphy=120
     37diagfi_output_rate=120
    3838
    3939

  • trunk/LMDZ.GENERIC/deftank/jupiter1d/rcm1d.def

    r1678 r3725  
    3838ndt            = 63000
    3939# ecriture physiq
    40 ecritphy = 200
     40diagfi_output_rate = 200
    4141
    4242## Vertical levels

  • trunk/LMDZ.GENERIC/deftank/rcm1d.def.earth

    r2110 r3725  
    1515ndt =20
    1616# Number of steps between each writing in diagfi
    17 ecritphy=12
     17diagfi_output_rate=12
    1818
    1919#### Physical parameters

  • trunk/LMDZ.GENERIC/deftank/run.def.32x24x25

    r2552 r3725  
    7070  grireg=.true.
    7171
    72 # Output in diagfi file every ecritphy dynamical steps
    73  ecritphy=120
    74 
    7572# longitude (degrees) of zoom center
    7673   clon=63.

  • trunk/LMDZ.GENERIC/deftank/run.def.64x48x25

    r2552 r3725  
    7070  grireg=.true.
    7171
    72 # Output in diagfi file every ecritphy dynamical steps
    73  ecritphy=240
    74 
    7572# longitude (degrees) of zoom center
    7673   clon=63.

  • trunk/LMDZ.GENERIC/deftank/run.def.earlymars_hires

    r2552 r3725  
    7070  grireg=.true.
    7171
    72 # Output in diagfi file every ecritphy dynamical steps
    73  ecritphy=1920
    74 
    7572# longitude (degrees) of zoom center
    7673   clon=63.

  • trunk/LMDZ.GENERIC/deftank/run.def.earth_hires

    r2552 r3725  
    6767  grireg=.true.
    6868
    69 # Output in diagfi file every ecritphy dynamical steps
    70  ecritphy=360
    71 
    7269# longitude (degrees) of zoom center
    7370   clon=0.

  • trunk/LMDZ.GENERIC/deftank/run.def.earthslab.64x48x30

    r3100 r3725  
    6565  grireg=.true.
    6666
    67 # Output in diagfi file every ecritphy dynamical steps
    68   ecritphy=9600
    69 # ecritphy=1
    70 
    7167# longitude (degrees) of zoom center
    7268   clon=0.

  • trunk/LMDZ.GENERIC/deftank/saturn1d/rcm1d.def

    r1876 r3725  
    4242ndt            = 342020
    4343# Number of steps between each writing in diagfi
    44 ecritphy=5000
     44diagfi_output_rate=5000
    4545
    4646# OVERRIDE callphys.def settings

  • trunk/LMDZ.GENERIC/libf/aeronostd/calchim_asis.F90

    r3312 r3725  
    1010      USE comcstfi_mod
    1111      use callkeys_mod
    12       use time_phylmdz_mod, only: ecritphy, iphysiq ! output rate set by ecritphy
     12      use time_phylmdz_mod, only: diagfi_output_rate ! output rate
    1313      use types_asis,       only: v_phot_3d, jlabel, nb_phot_hv_max
    1414      use chimiedata_h
    … …  
    133133      integer :: iter(nlayer)      !  Number of chemical iterations
    134134                                   !  within one physical timestep
    135       integer :: icount
     135      integer,intent(in) :: icount ! physics iteration number
    136136!     for output:
    137137
    … …  
    285285                        ig, zzlay, zzlev, zdens, zycol, ptimestep)
    286286            surface_flux2(ig,:) = surface_flux2(ig,:) + surface_flux(ig,:)
    287             if (ngrid==1) then
    288               if(mod(icount,ecritphy).eq.0) then
    289                 surface_flux2(ig,:) = surface_flux2(ig,:)/float(ecritphy)
    290               endif
    291             else
    292               if(mod(icount*iphysiq,ecritphy).eq.0) then
    293                 surface_flux2(ig,:) = surface_flux2(ig,:)*iphysiq/float(ecritphy)
    294               endif
     287            if(mod(icount,diagfi_output_rate).eq.0) then
     288              !note that surface_flux2(:,:) is reset every diagfi_output_rate
     289              surface_flux2(ig,:) = surface_flux2(ig,:)/float(diagfi_output_rate)
    295290            endif
    296          end if
     291         end if ! of if (depos)
    297292
    298293!=======================================================================
    … …  
    405400            end do
    406401            ! Restart flux average
    407             if (ngrid == 1) then
    408                if(mod(icount,ecritphy).eq.0) then
    409                   surface_flux2(:,:) = 0.0
    410                endif
    411             else
    412                if(mod(icount*iphysiq,ecritphy).eq.0) then
    413                   surface_flux2(:,:) = 0.0
    414                endif
     402            if(mod(icount,diagfi_output_rate).eq.0) then
     403              surface_flux2(:,:) = 0.0
    415404            endif
    416405         endif ! end depos
    … …  
    424413
    425414      end if ! of if (output)
    426 
    427       return
    428415
    429416

  • trunk/LMDZ.GENERIC/libf/aeronostd/writediagspecUV.F

    r3309 r3725  
    3030     &                              nbp_lon, nbp_lat, grid_type,
    3131     &                              unstructured
    32       use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
     32      use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
     33      use time_phylmdz_mod, only: day_ini
    3334
    3435      implicit none
    … …  
    4849!      real dx0
    4950
    50       integer irythme
     51      integer isample
    5152      integer ierr
    5253      integer iq
    … …  
    8788!output frequency
    8889
    89       irythme = ecritphy ! output with ecritphy frequency
    90 !EM+JL if the spetra need to be output more frequently, need to define a ecritSpec...
    91 !     irythme = iphysiq  ! sortie a tous les pas physique
     90      isample = diagfi_output_rate ! output with ecritphy frequency
     91!EM+JL if the spectra need to be output more frequently, need to define a
     92! diagspec_output_rate...
    9293
    9394!***************************************************************
    … …  
    173174!------------------------------------------------------------------------
    174175      if (nom.eq.firstnom) then
    175           zitau = zitau + iphysiq
     176          zitau = zitau + 1
    176177      end if
    177178
    … …  
    180181!--------------------------------------------------------
    181182
    182       if ( MOD(zitau+1,irythme) .eq.0.) then
     183      if ( MOD(zitau+1,isample) .eq.0.) then
    183184
    184185! Compute/write/extend 'Time' coordinate (date given in days)
    … …  
    193194           ntime=ntime+1 ! increment # of stored time steps
    194195           ! compute corresponding date (in days and fractions thereof)
    195            date= float (zitau +1)/float (day_step)
     196           date=(zitau +1)*(dtphys/daysec)
    196197
    197198           if (is_master) then
    … …  
    313314        endif ! of if (dimpx.eq.3)
    314315
    315       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
     316      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
    316317
    317318      ! Close the NetCDF file

  • trunk/LMDZ.GENERIC/libf/phystd/dyn1d/rcm1d.F

    r3716 r3725  
    2121      use comcstfi_mod, only: pi, cpp, rad, g, r,
    2222     &                        mugaz, rcp, omeg
    23       use time_phylmdz_mod, only: daysec, dtphys, day_step, ecritphy,
    24      &                            nday, iphysiq
     23      use time_phylmdz_mod, only: daysec, dtphys, nday,
     24     &                            diagfi_output_rate
    2525      use callkeys_mod, only: tracer,rings_shadow,
    2626     &                        specOLR,water,pceil,ok_slab_ocean,photochem
    … …  
    7171!==================================================================
    7272
    73 #include "dimensions.h"
    74 #include "paramet.h"
    75 !include "dimphys.h"
    76 #include "netcdf.inc"
    77 #include "comgeom.h"
     73      include "dimensions.h"
     74      include "paramet.h"
     75      include "comgeom.h"
    7876
    7977c --------------------------------------------------------------
    … …  
    9189c
    9290      INTEGER day0          ! date initial (sol ; =0 a Ls=0)
    93       REAL day              ! date durant le run
     91      REAL day              ! date during the run
     92      INTEGER day_step ! number of time steps per day
    9493      REAL time             ! time (0<time<1 ; time=0.5 a midi)
    9594      REAL play(llm)        ! Pressure at the middle of the layers (Pa)
    … …  
    596595      write(*,*) " day_step = ",day_step
    597596
    598       iphysiq=1 ! in 1D model physics are called evry time step
    599       ecritphy=day_step ! default value for ecritphy
     597      diagfi_output_rate=day_step ! default value for diagfi_output_rate
    600598      PRINT *,'Nunber of steps between writediagfi ?'
    601       call getin("ecritphy",ecritphy)
    602       write(*,*) " ecritphy = ",ecritphy
     599      call getin("diagfi_output_rate",diagfi_output_rate)
     600      write(*,*) " diagfi_output_rate = ",diagfi_output_rate
    603601
    604602      ndt=10 ! default value for ndt

  • trunk/LMDZ.GENERIC/libf/phystd/inifis_mod.F90

    r3701 r3725  
    1717  use comgeomfi_h, only: totarea, totarea_planet
    1818  use comsoil_h, only: ini_comsoil_h, nsoilmx, lay1_soil, alpha_soil
    19   use time_phylmdz_mod, only: ecritphy,day_step,iphysiq, &
     19  use time_phylmdz_mod, only: diagfi_output_rate, &
    2020                              init_time, daysec, dtphys
    2121  use comcstfi_mod, only: rad, cpp, g, r, rcp, &
    … …  
    7676  integer,intent(in) :: day_ini
    7777
    78   INTEGER ig
     78  INTEGER :: ig
     79  REAL :: ecritphy ! to check that this obsolete flag is no longer used...
    7980  CHARACTER(len=20) :: rname="inifis" ! routine name, for messages
    8081 
    … …  
    103104  ! read in some parameters from "run.def" for physics,
    104105  ! or shared between dynamics and physics.
     106  ecritphy=-666 ! dummy default value
    105107  call getin_p("ecritphy",ecritphy) ! frequency of outputs in physics,
    106108                                    ! in dynamical steps
    107   call getin_p("day_step",day_step) ! number of dynamical steps per day
    108   call getin_p("iphysiq",iphysiq) ! call physics every iphysiq dyn step
     109  if (ecritphy/=-666) then
     110    call abort_physic(rname, &
     111         "Error: parameter ecritphy is obsolete! Remove it! "//&
     112         "And use diagfi_output_rate instead",1)
     113  endif
    109114
    110115  ! do we read a startphy.nc file? (default: .true.)
    … …  
    142147     call getin_p("tracer",tracer)
    143148     if (is_master) write(*,*) trim(rname)//": tracer = ",tracer
     149
     150     if (is_master) write(*,*) trim(rname)//&
     151       ": Output rate for diagfi.nc file (in physics steps) ?"
     152     diagfi_output_rate=24 !default value
     153     call getin_p("diagfi_output_rate",diagfi_output_rate)
     154     if (is_master) write(*,*) trim(rname)//": diagfi_output_rate = ",&
     155                               diagfi_output_rate
    144156
    145157     if (is_master) write(*,*) trim(rname)//&

  • trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

    r3724 r3725  
    3737                          igcm_h2o_ice, igcm_h2o_vap, igcm_dustbin, &
    3838                          igcm_co2_ice, nesp, is_chim, is_condensable,constants_epsi_generic
    39                         !  igcm_co2_ice, nesp, is_chim, is_condensable,constants_epsi_generic, &
    40                         !  half_life, top_prod, bot_prod
    41       use time_phylmdz_mod, only: ecritphy, iphysiq, nday
     39      use time_phylmdz_mod, only: diagfi_output_rate, nday
    4240      use phyetat0_mod, only: phyetat0,tab_cntrl_mod
    4341      use surfini_mod, only: surfini
    … …  
    22492247
    22502248         if(meanOLR .and. is_master)then
    2251             if((ngrid.gt.1) .or. (mod(icount-1,ecritphy).eq.0))then
     2249            if((ngrid.gt.1) .or. (mod(icount-1,diagfi_output_rate).eq.0))then
    22522250               ! to record global radiative balance
    22532251               open(92,file="rad_bal.out",form='formatted',position='append')
    … …  
    23262324
    23272325         if(meanOLR .and. is_master)then
    2328             if((ngrid.gt.1) .or. (mod(icount-1,ecritphy).eq.0))then
     2326            if((ngrid.gt.1) .or. (mod(icount-1,diagfi_output_rate).eq.0))then
    23292327               ! to record global water balance
    23302328               open(98,file="h2o_bal.out",form='formatted',position='append')
    … …  
    24032401
    24042402      if(lastcall) then
    2405          ztime_fin = ptime + ptimestep/(float(iphysiq)*daysec)
     2403         ztime_fin = ptime + (ptimestep/daysec)
    24062404
    24072405#ifndef MESOSCALE
    … …  
    25252523!           OUTPUT in netcdf file "DIAGFI.NC", containing any variable for diagnostic
    25262524!
    2527 !             Note 1 : output with  period "ecritphy", set in "run.def"
     2525!             Note 1 : output with  period "diagfi_output_rate", set in "run.def"
    25282526!
    25292527!             Note 2 : writediagfi can also be called from any other subroutine for any variable,

  • trunk/LMDZ.GENERIC/libf/phystd/time_phylmdz_mod.F90

    r1525 r3725  
    44    REAL,SAVE    :: dtphys     ! physics time step (s)
    55!$OMP THREADPRIVATE(dtphys)
    6     INTEGER,SAVE :: day_step    ! number of dynamical steps per day
    7                                 ! (set via inifis)
    8 !$OMP THREADPRIVATE(day_step)
    96    INTEGER,SAVE :: nday       ! number of days to run
    107!$OMP THREADPRIVATE(nday)
    … …  
    1411!$OMP THREADPRIVATE(day_ini)
    1512
    16     INTEGER,SAVE :: ecritphy  ! for diagfi.nc outputs, write every ecritphy
    17                               ! dynamical steps (set via inifis)
    18 !$OMP THREADPRIVATE(ecritphy)
    19     INTEGER,SAVE :: iphysiq   ! call physics every iphysiq dynamical step
    20                               ! (set via inifis)
    21 !$OMP THREADPRIVATE(iphysiq)
     13    INTEGER,SAVE :: diagfi_output_rate ! for diagfi.nc outputs, write every
     14                                     ! diagfi_output_rate physical step
     15                                    ! (set via inifis)
     16!$OMP THREADPRIVATE(diagfi_output_rate)
    2217
    2318CONTAINS

  • trunk/LMDZ.GENERIC/libf/phystd/volcano.F90

    r3436 r3725  
    338338        READ(407,*,iostat=ierr) nvoltrac
    339339        write(*,*)trim(rname)//' number of outgased tracers:',nvoltrac
    340         !Read in eruption frequency (in multiples of iphysiq) and offset of eruption
     340        !Read in eruption frequency (in sols) and offset of eruption
    341341        READ(407,'(A)',iostat=ierr) tracline
    342342        READ(tracline,*) eruptfreq, eruptoffset, eruptdur

  • trunk/LMDZ.GENERIC/libf/phystd/writediagfi.F

    r2957 r3725  
    4141      use surfdat_h, only: phisfi
    4242      use geometry_mod, only: cell_area
    43       use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
     43      use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
     44      use time_phylmdz_mod, only: day_ini
    4445      USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
    4546     &                               is_master, gather
    … …  
    7374      REAL area((nbp_lon+1),nbp_lat)
    7475
    75       integer irythme
    7676      integer ierr,ierr2
    7777      integer i,j,l, ig0
    … …  
    119119           return
    120120      endif
    121 
    122 !***************************************************************
    123 !Sortie des variables au rythme voulu
    124 
    125       irythme = int(ecritphy) ! output rate set by ecritphy
    126121
    127122!***************************************************************
    … …  
    267262!------------------------------------------------------------------------
    268263      if (nom.eq.firstnom) then
    269           zitau = zitau + iphysiq
     264          zitau = zitau + 1
    270265      end if
    271266
    … …  
    274269!--------------------------------------------------------
    275270
    276       if ( MOD(zitau+1,irythme) .eq.0.) then
     271      if ( MOD(zitau+1,diagfi_output_rate) .eq.0.) then
    277272
    278273! Compute/write/extend 'Time' coordinate (date given in days)
    … …  
    287282           ntime=ntime+1 ! increment # of stored time steps
    288283           ! compute corresponding date (in days and fractions thereof)
    289            date=(zitau +1.)/day_step
     284           date=(zitau +1.)*(dtphys/daysec)
    290285           ! Get NetCDF ID of 'Time' variable
    291286           ierr= NF_INQ_VARID(nid,"Time",varid)
    … …  
    619614        endif ! of if (dim.eq.3) elseif(dim.eq.2)...
    620615
    621       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
     616      endif ! of if ( MOD(zitau+1,diagfi_output_rate) .eq.0.)
    622617
    623618      if (is_master) then

  • trunk/LMDZ.GENERIC/libf/phystd/writediagsoil.F90

    r3522 r3725  
    2020use comsoil_h, only: nsoilmx, inertiedat
    2121use geometry_mod, only: cell_area
    22 use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
     22use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
    2323use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
    2424use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo, &
    … …  
    9292    stop
    9393  endif
    94 
    95   ! Set output sample rate
    96   isample=int(ecritphy) ! same as for diagfi outputs
    97   ! Note ecritphy is known from control.h
    9894
    9995  ! Create output NetCDF file
    … …  
    158154if (name.eq.firstname) then
    159155  ! if we run across 'firstname', then it is a new time step
    160   zitau=zitau+iphysiq
    161   ! Note iphysiq is known from control.h
     156  zitau=zitau+1
    162157endif
    163158
    164159! 3. Write data, if the time index matches the sample rate
    165 if (mod(zitau+1,isample).eq.0) then
     160if (mod(zitau+1,diagfi_output_rate).eq.0) then
    166161
    167162! 3.1 If first call at this date, update 'time' variable
    168163  if (name.eq.firstname) then
    169164    ntime=ntime+1
    170     date=float(zitau+1)/float(day_step)
     165    date=(zitau+1)*(dtphys/daysec)
    171166    ! Note: day_step is known from control.h
    172167
    … …  
    394389
    395390endif ! of if (dimpx.eq.3) elseif (dimpx.eq.2) ...
    396 endif ! of if (mod(zitau+1,isample).eq.0)
     391endif ! of if (mod(zitau+1,diagfi_output_rate).eq.0)
    397392
    398393! 4. Close the NetCDF file

  • trunk/LMDZ.GENERIC/libf/phystd/writediagspecIR.F

    r2732 r3725  
    4848     &                              nbp_lon, nbp_lat, grid_type,
    4949     &                              unstructured
    50       use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
     50      use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
     51      use time_phylmdz_mod, only: day_ini
    5152      use callkeys_mod, only: iradia
    5253
    … …  
    6768!      real dx0
    6869
    69       integer irythme
     70      integer isample
    7071      integer ierr
    7172      integer iq
    … …  
    106107!Sortie des variables au rythme voulu
    107108
    108       irythme = ecritphy*iradia ! sortie au rythme de ecritphy*iradia
    109 !EM+JL if the spetra need to be output more frequently, need to define a ecritSpec...
    110 !     irythme = iphysiq  ! sortie a tous les pas physique
     109      isample = diagfi_output_rate*iradia ! output rate
     110!EM+JL if the spectra need to be output more frequently, need to define a
     111! diagspec_output_rate...
    111112
    112113
    … …  
    193194!------------------------------------------------------------------------
    194195      if (nom.eq.firstnom) then
    195           zitau = zitau + iphysiq
     196          zitau = zitau + 1
    196197      end if
    197198
    … …  
    200201!--------------------------------------------------------
    201202
    202       if ( MOD(zitau+1,irythme) .eq.0.) then
     203      if ( MOD(zitau+1,isample) .eq.0.) then
    203204
    204205! Compute/write/extend 'Time' coordinate (date given in days)
    … …  
    213214           ntime=ntime+1 ! increment # of stored time steps
    214215           ! compute corresponding date (in days and fractions thereof)
    215            date= float (zitau +1)/float (day_step)
     216           date=(zitau +1)*(dtphys/daysec)
    216217
    217218           if (is_master) then
    … …  
    333334        endif ! of if (dimpx.eq.3)
    334335
    335       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
     336      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
    336337
    337338      ! Close the NetCDF file

  • trunk/LMDZ.GENERIC/libf/phystd/writediagspecVI.F

    r2732 r3725  
    4848     &                              nbp_lon, nbp_lat, grid_type,
    4949     &                              unstructured
    50       use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
     50      use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
     51      use time_phylmdz_mod, only: day_ini
    5152      use callkeys_mod, only: iradia
    5253
    … …  
    6768!      real dx0
    6869
    69       integer irythme
     70      integer isample
    7071      integer ierr
    7172      integer iq
    … …  
    106107!Sortie des variables au rythme voulu
    107108
    108       irythme = ecritphy*iradia ! sortie au rythme de ecritphy
    109 !EM+JL if the spetra need to be output more frequently, need to define a ecritSpec...
    110 !     irythme = iphysiq  ! sortie a tous les pas physique
     109      isample = diagfi_output_rate*iradia ! output rate
     110!EM+JL if the spectra need to be output more frequently, need to define a
     111! diagspec_output_rate...
    111112
    112113!***************************************************************
    … …  
    192193!------------------------------------------------------------------------
    193194      if (nom.eq.firstnom) then
    194           zitau = zitau + iphysiq
     195          zitau = zitau + 1
    195196      end if
    196197
    … …  
    199200!--------------------------------------------------------
    200201
    201       if ( MOD(zitau+1,irythme) .eq.0.) then
     202      if ( MOD(zitau+1,isample) .eq.0.) then
    202203
    203204! Compute/write/extend 'Time' coordinate (date given in days)
    … …  
    212213           ntime=ntime+1 ! increment # of stored time steps
    213214           ! compute corresponding date (in days and fractions thereof)
    214            date= float (zitau +1)/float (day_step)
     215           date=(zitau +1)*(dtphys/daysec)
    215216
    216217           if (is_master) then
    … …  
    332333        endif ! of if (dimpx.eq.3)
    333334
    334       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
     335      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
    335336
    336337      ! Close the NetCDF file
Note: See TracChangeset for help on using the changeset viewer.