Changeset 4361 for LMDZ6/trunk/libf

Timestamp:

Dec 1, 2022, 1:07:55 PM (2 years 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/libf

Files:

• dyn3d/gcm.F90 (modified) (1 diff)
• dyn3dmem/gcm.F90 (modified) (1 diff)
• dynphy_lonlat/phylmd/ce0l.F90 (modified) (1 diff)
• dynphy_lonlat/phylmd/limit_netcdf.F90 (modified) (1 diff)
• phylmd/create_limit_unstruct.F90 (modified) (1 diff)
• phylmd/dyn1d/old_lmdz1d.F90 (modified) (1 diff)
• phylmd/dyn1d/replay1d.F90 (modified) (1 diff)
• phylmd/dyn1d/scm.F90 (modified) (1 diff)
• phylmd/iophys.F90 (modified) (1 diff)
• phylmd/phys_cal_mod.F90 (modified) (1 diff)

LMDZ6/trunk/libf/dyn3d/gcm.F90

@@ -178 +178 @@
 #ifdef CPP_IOIPSL
   if (calend == 'earth_360d') then
-     call ioconf_calendar('360d')
+     call ioconf_calendar('360_day')
      write(lunout,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
   else if (calend == 'earth_365d') then

LMDZ6/trunk/libf/dyn3dmem/gcm.F90

@@ -182 +182 @@
 #ifdef CPP_IOIPSL
   if (calend == 'earth_360d') then
-     call ioconf_calendar('360d')
+     call ioconf_calendar('360_day')
      write(lunout,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
      xios_cal_type='d360'

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

@@ -108 +108 @@
   calnd='gregorian'
   SELECT CASE(calend)
-    CASE('earth_360d');CALL ioconf_calendar('360d');   calnd='with 360 days/year'
+    CASE('earth_360d');CALL ioconf_calendar('360_day');   calnd='with 360 days/year'
     CASE('earth_365d');CALL ioconf_calendar('noleap'); calnd='with no leap year'
     CASE('earth_366d');CALL ioconf_calendar('366d');   calnd='with leap years only'

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

@@ -424 +424 @@
   IF(NF90_GET_ATT(ncid, varid, 'calendar', cal_in)/=NF90_NOERR) THEN
     SELECT CASE(mode)
-      CASE('RUG', 'ALB'); cal_in='360d'
+      CASE('RUG', 'ALB'); cal_in='360_day'
       CASE('SIC', 'SST'); cal_in='gregorian'
     END SELECT

LMDZ6/trunk/libf/phylmd/create_limit_unstruct.F90

@@ -111 +111 @@
       WHERE(NINT(zmasq(:))/=1) rugos(:,l)=0.001
     ENDDO
-    CALL time_interpolation(ndays,rugos,'360d',rugos_year)
+    CALL time_interpolation(ndays,rugos,'360_day',rugos_year)
 
 ! albedo    
-    CALL time_interpolation(ndays,albedo,'360d',albedo_year)
+    CALL time_interpolation(ndays,albedo,'360_day',albedo_year)
 
 

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

@@ -494 +494 @@
 !      calend = 'earth_365d'
       if (calend == 'earth_360d') then
-        call ioconf_calendar('360d')
+        call ioconf_calendar('360_day')
         write(*,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
       else if (calend == 'earth_365d') then

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

@@ -56 +56 @@
 call getin('day_step',day_step)
 calendrier=calend
-if ( calendrier == "earth_360d" ) calendrier="360d"
+if ( calendrier == "earth_360d" ) calendrier="360_day"
 
 

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

@@ -327 +327 @@
 !      calend = 'earth_365d'
       if (calend == 'earth_360d') then
-        call ioconf_calendar('360d')
+        call ioconf_calendar('360_day')
         write(*,*)'CALENDRIER CHOISI: Terrestre a 360 jours/an'
       else if (calend == 'earth_365d') then

LMDZ6/trunk/libf/phylmd/iophys.F90

@@ -173 +173 @@
 t0=0.
 calendrier=calend
-if ( calendrier == "earth_360d" ) calendrier="360d"
+if ( calendrier == "earth_360d" ) calendrier="360_day"
 
 print*,'iophys_ini annee_ref day_ref',annee_ref,day_ref,day_ini,calend,t0

LMDZ6/trunk/libf/phylmd/phys_cal_mod.F90

@@ -51 +51 @@
     IF (is_omp_master) THEN
       IF (calend == 'earth_360d') THEN
-        CALL ioconf_calendar('360d')
+        CALL ioconf_calendar('360_day')
       ELSE IF (calend == 'earth_365d') THEN
         CALL ioconf_calendar('noleap')