Changeset 4361


Ignore:
Timestamp:
Dec 1, 2022, 1:07:55 PM (18 months ago)
Author:
lguez
Message:

Change calendar attribute "360d" to "360_day"

"360_day" is the correct attribute according to CF convention. "360d"
leads to an error when opening a history file with xarray.

Location:
LMDZ6/trunk
Files:
12 edited

Legend:

Unmodified
Added
Removed

  • LMDZ6/trunk/arch/arch-X64_JEANZAY.path

    r3580 r4361  
    44NETCDF_LIBDIR="-lnetcdf -lnetcdff"
    55NETCDF_INCDIR=
    6 IOIPSL_INCDIR="$LMDGCM/../../lib -I$LMDGCM/../IOIPSL/inc"
    7 IOIPSL_LIBDIR="$LMDGCM/../../lib -lioipsl -L$LMDGCM/../IOIPSL/lib"
     6IOIPSL_INCDIR=$WORK/build/IOIPSL/inc
     7IOIPSL_LIBDIR=$WORK/build/IOIPSL/lib
    88ORCH_INCDIR=$LMDGCM/../../lib
    99ORCH_LIBDIR=$LMDGCM/../../lib
    … …  
    1212INCA_LIBDIR=$LMDGCM/../INCA/build/lib
    1313INCA_INCDIR=$LMDGCM/../INCA/build/inc
    14 XIOS_INCDIR=$LMDGCM/../XIOS/inc
    15 XIOS_LIBDIR=$LMDGCM/../XIOS/lib
     14XIOS_INCDIR=$WORK/include/XIOS
     15XIOS_LIBDIR=$WORK/lib

  • LMDZ6/trunk/bld.cfg

    r4247 r4361  
    4848dir::root            %CONFIG_PATH
    4949#dir::lib             %BASE_CONFIG_PATH
    50 dir::bin             %ROOT_PATH/bin
     50dir::bin             %LIBO
    5151
    5252#search_src           1

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

    r4325 r4361  
    178178#ifdef CPP_IOIPSL
    179179  if (calend == 'earth_360d') then
    180      call ioconf_calendar('360d')
     180     call ioconf_calendar('360_day')
    181181     write(lunout,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
    182182  else if (calend == 'earth_365d') then

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

    r4325 r4361  
    182182#ifdef CPP_IOIPSL
    183183  if (calend == 'earth_360d') then
    184      call ioconf_calendar('360d')
     184     call ioconf_calendar('360_day')
    185185     write(lunout,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
    186186     xios_cal_type='d360'

  • LMDZ6/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

    r4325 r4361  
    108108  calnd='gregorian'
    109109  SELECT CASE(calend)
    110     CASE('earth_360d');CALL ioconf_calendar('360d');   calnd='with 360 days/year'
     110    CASE('earth_360d');CALL ioconf_calendar('360_day');   calnd='with 360 days/year'
    111111    CASE('earth_365d');CALL ioconf_calendar('noleap'); calnd='with no leap year'
    112112    CASE('earth_366d');CALL ioconf_calendar('366d');   calnd='with leap years only'

  • LMDZ6/trunk/libf/dynphy_lonlat/phylmd/limit_netcdf.F90

    r4261 r4361  
    424424  IF(NF90_GET_ATT(ncid, varid, 'calendar', cal_in)/=NF90_NOERR) THEN
    425425    SELECT CASE(mode)
    426       CASE('RUG', 'ALB'); cal_in='360d'
     426      CASE('RUG', 'ALB'); cal_in='360_day'
    427427      CASE('SIC', 'SST'); cal_in='gregorian'
    428428    END SELECT

  • LMDZ6/trunk/libf/phylmd/create_limit_unstruct.F90

    r3531 r4361  
    111111      WHERE(NINT(zmasq(:))/=1) rugos(:,l)=0.001
    112112    ENDDO
    113     CALL time_interpolation(ndays,rugos,'360d',rugos_year)
     113    CALL time_interpolation(ndays,rugos,'360_day',rugos_year)
    114114
    115115! albedo   
    116     CALL time_interpolation(ndays,albedo,'360d',albedo_year)
     116    CALL time_interpolation(ndays,albedo,'360_day',albedo_year)
    117117
    118118

  • LMDZ6/trunk/libf/phylmd/dyn1d/old_lmdz1d.F90

    r4325 r4361  
    494494!      calend = 'earth_365d'
    495495      if (calend == 'earth_360d') then
    496         call ioconf_calendar('360d')
     496        call ioconf_calendar('360_day')
    497497        write(*,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
    498498      else if (calend == 'earth_365d') then

  • LMDZ6/trunk/libf/phylmd/dyn1d/replay1d.F90

    r4350 r4361  
    5656call getin('day_step',day_step)
    5757calendrier=calend
    58 if ( calendrier == "earth_360d" ) calendrier="360d"
     58if ( calendrier == "earth_360d" ) calendrier="360_day"
    5959
    6060

  • LMDZ6/trunk/libf/phylmd/dyn1d/scm.F90

    r4325 r4361  
    327327!      calend = 'earth_365d'
    328328      if (calend == 'earth_360d') then
    329         call ioconf_calendar('360d')
     329        call ioconf_calendar('360_day')
    330330        write(*,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
    331331      else if (calend == 'earth_365d') then

  • LMDZ6/trunk/libf/phylmd/iophys.F90

    r4350 r4361  
    173173t0=0.
    174174calendrier=calend
    175 if ( calendrier == "earth_360d" ) calendrier="360d"
     175if ( calendrier == "earth_360d" ) calendrier="360_day"
    176176
    177177print*,'iophys_ini annee_ref day_ref',annee_ref,day_ref,day_ini,calend,t0

  • LMDZ6/trunk/libf/phylmd/phys_cal_mod.F90

    r3452 r4361  
    5151    IF (is_omp_master) THEN
    5252      IF (calend == 'earth_360d') THEN
    53         CALL ioconf_calendar('360d')
     53        CALL ioconf_calendar('360_day')
    5454      ELSE IF (calend == 'earth_365d') THEN
    5555        CALL ioconf_calendar('noleap')
Note: See TracChangeset for help on using the changeset viewer.