Changeset 6102 for LMDZ6/trunk/libf/phylmd/macv2sp.f90

Timestamp:

Mar 12, 2026, 4:02:42 PM (11 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 ).

File:

• LMDZ6/trunk/libf/phylmd/macv2sp.f90 (modified) (7 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 )
     !