Changeset 1209 for trunk


Ignore:
Timestamp:
Mar 12, 2014, 6:04:44 PM (11 years ago)
Author:
tnavarro
Message:

There was a name conflict with the variable year_day used for the newtonian relaxation in LMDZ.COMMON and the one used in the physics of LMDZ.MARS. This conflict just appeared with the moving of lect_start_archive from dyn3d to phymars in the commit 1208 done for LMDZ.MARS

Location:
trunk/LMDZ.COMMON/libf
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.COMMON/libf/dyn3d/comconst.h

    r979 r1209  
    1111     & ,dissip_fac_mid,dissip_fac_up,dissip_deltaz,dissip_hdelta        &
    1212     & ,dissip_pupstart  ,tau_top_bound,                                &
    13      & daylen,year_day,molmass, ihf
     13     & daylen,molmass, ihf
    1414      COMMON/cpdetvenus/cpp,nu_venus,t0_venus
    1515
    … …  
    3737      REAL tau_top_bound
    3838      REAL daylen ! length of solar day, in 'standard' day length
    39       REAL year_day ! Number of standard days in a year
    4039      REAL molmass ! (g/mol) molar mass of the atmosphere
    4140

  • trunk/LMDZ.COMMON/libf/dyn3d/conf_planete.F90

    r53 r1209  
    2121!   local:
    2222!   ------
     23
     24real :: year_day_dyn
    2325
    2426! ---------------------------------------------
    … …  
    5759CALL getin('daylen',daylen)
    5860! Number of days (standard) per year:
    59 year_day = 365.25
    60 CALL getin('year_day',year_day)
     61year_day_dyn = 365.25
     62CALL getin('year_day',year_day_dyn)
    6163! Omega
    6264! omeg=2.*pi/86400.
    63 omeg=2.*pi/daysec*(1./daylen+1./year_day)
     65omeg=2.*pi/daysec*(1./daylen+1./year_day_dyn)
    6466CALL getin('omeg',omeg)
    6567

  • trunk/LMDZ.COMMON/libf/dyn3dpar/comconst.h

    r979 r1209  
    1111     & ,dissip_fac_mid,dissip_fac_up,dissip_deltaz,dissip_hdelta        &
    1212     & ,dissip_pupstart  ,tau_top_bound,                                &
    13      & daylen,year_day,molmass, ihf
     13     & daylen,molmass, ihf
    1414      COMMON/cpdetvenus/cpp,nu_venus,t0_venus
    1515
    … …  
    3737      REAL tau_top_bound
    3838      REAL daylen ! length of solar day, in 'standard' day length
    39       REAL year_day ! Number of standard days in a year
    4039      REAL molmass ! (g/mol) molar mass of the atmosphere
    4140

  • trunk/LMDZ.COMMON/libf/dyn3dpar/conf_planete.F90

    r52 r1209  
    2121!   local:
    2222!   ------
     23
     24real :: year_day_dyn
    2325
    2426! ---------------------------------------------
    … …  
    5759CALL getin('daylen',daylen)
    5860! Number of days (standard) per year:
    59 year_day = 365.25
    60 CALL getin('year_day',year_day)
     61year_day_dyn = 365.25
     62CALL getin('year_day',year_day_dyn)
    6163! Omega
    6264! omeg=2.*pi/86400.
    63 omeg=2.*pi/daysec*(1./daylen+1./year_day)
     65omeg=2.*pi/daysec*(1./daylen+1./year_day_dyn)
    6466CALL getin('omeg',omeg)
    6567
Note: See TracChangeset for help on using the changeset viewer.