Changeset 6102

Timestamp:

Mar 12, 2026, 4:02:42 PM (10 days ago)

Author:

asima

Message:

Variable year_fr is renamed more properly decimal_year, to avoid confusion with a dimension name in the input SP aerosol file (year_fr = 52 ).

Location:

LMDZ6/trunk/libf/phylmd

Files:

• macv2sp.f90 (modified) (7 diffs)
• mo_simple_plumes.f90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/macv2sp.f90

@@ -58 +58 @@
   !
   REAL :: zlambda, zweight
-  REAL :: year_fr
+!  REAL :: year_fr  ! also a dimension name in SP aerosol file ; renamed more properly "decimal_year" 
+  REAL :: decimal_year 
   !
   INTEGER band, i, k, Nwv
@@ -79 +80 @@
   !
 
-  ! Call sp_setup to retrieve 'aerosol_SP_forcing_year' value used in year_fr calculation below
+  ! Call sp_setup to retrieve 'aerosol_SP_forcing_year' value used in decimal_year calculation below
   IF (.NOT.sp_initialized) CALL sp_setup
 
@@ -90 +91 @@
 ! Choice between yearly vs fixed_year forcing, depending on 'aerosols_SP_forcing_year'
   IF (aerosols_SP_forcing_year.EQ.-9999) THEN
-     year_fr= float(year_cur) + float(days_elapsed)/float(year_len)
+     decimal_year= float(year_cur) + float(days_elapsed)/float(year_len)
   ELSE
-     year_fr= float(aerosols_SP_forcing_year) + float(days_elapsed)/float(year_len)
+     decimal_year= float(aerosols_SP_forcing_year) + float(days_elapsed)/float(year_len)
   ENDIF
 
-  IF (year_fr.LT.1850.0.OR.year_fr.GE.2024.0) THEN
+  IF (decimal_year.LT.1850.0.OR.decimal_year.GE.2024.0) THEN
      CALL abort_physic ('macv2sp','year not supported by plume model',1)
   ENDIF
@@ -103 +104 @@
   CALL sp_aop_profile                                    ( &
        klev     ,klon ,l443 ,oro    ,xlon     ,xlat      , &
-       year_fr  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
+       decimal_year  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
        asy_prof )
   !
@@ -113 +114 @@
   CALL sp_aop_profile                                    ( &
        klev     ,klon ,l550 ,oro    ,xlon     ,xlat      , &
-       year_fr  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
+       decimal_year  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
        asy_prof )
   !
@@ -142 +143 @@
   CALL sp_aop_profile                                    ( &
        klev     ,klon ,l865 ,oro    ,xlon     ,xlat      , &
-       year_fr  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
+       decimal_year  ,z    ,dz   ,dNovrN ,aod_prof ,ssa_prof  , &
        asy_prof )
   !
@@ -185 +186 @@
     CALL sp_aop_profile                                       ( &
          klev     ,klon ,zlambda ,oro    ,xlon     ,xlat      , &
-         year_fr  ,z    ,dz      ,dNovrN ,aod_prof ,ssa_prof  , &
+         decimal_year  ,z    ,dz      ,dNovrN ,aod_prof ,ssa_prof  , &
          asy_prof )
     !

LMDZ6/trunk/libf/phylmd/mo_simple_plumes.f90

@@ -290 +290 @@
   ! week in the year and superimposed on the yearly mean value of the weight. 
   !
-  SUBROUTINE set_time_weight(year_fr)
+  SUBROUTINE set_time_weight(decimal_year)
     !
     ! ---------- 
     !
     REAL, INTENT(IN) ::  &
-         year_fr           !< Fractional Year (1850.0 - 2100.99)
+         decimal_year      !< Fractional Year (1850.0 - 2100.99)
 
     INTEGER          ::  &
@@ -304 +304 @@
     ! ---------- 
     !
-    iyear = FLOOR(year_fr) - 1849
-    iweek = FLOOR((year_fr - FLOOR(year_fr)) * ntimes) + 1
+    iyear = FLOOR(decimal_year) - 1849
+    iweek = FLOOR((decimal_year - FLOOR(decimal_year)) * ntimes) + 1
 
     IF ((iweek > ntimes) .OR. (iweek < 1) .OR. (iyear > nyears) .OR. (iyear < 1)) THEN 
@@ -328 +328 @@
   SUBROUTINE sp_aop_profile                                                                           ( &
        nlevels        ,ncol           ,lambda         ,oro            ,lon            ,lat            , &
-       year_fr        ,z              ,dz             ,dNovrN         ,aod_prof       ,ssa_prof       , &
+       decimal_year        ,z              ,dz             ,dNovrN         ,aod_prof       ,ssa_prof       , &
        asy_prof       )
     !
@@ -339 +339 @@
     REAL, INTENT(IN)           :: &
          lambda,                  & !< wavelength
-         year_fr,                 & !< Fractional Year (1903.0 is the 0Z on the first of January 1903, Gregorian)
+         decimal_year,            & !< Fractional Year (1903.0 is the 0Z on the first of January 1903, Gregorian)
          oro(ncol),               & !< orographic height (m)
          lon(ncol),               & !< longitude 
@@ -393 +393 @@
     ! get time weights
     !
-    CALL set_time_weight(year_fr)
+    CALL set_time_weight(decimal_year)
     !
     ! initialize variables, including output