Changeset 1209 for trunk/LMDZ.COMMON/libf/dyn3d/conf_planete.F90

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

File:

• trunk/LMDZ.COMMON/libf/dyn3d/conf_planete.F90 (modified) (2 diffs)

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

@@ -21 +21 @@
 !   local:
 !   ------
+
+real :: year_day_dyn
 
 ! ---------------------------------------------
@@ -57 +59 @@
 CALL getin('daylen',daylen)
 ! Number of days (standard) per year:
-year_day = 365.25
-CALL getin('year_day',year_day)
+year_day_dyn = 365.25
+CALL getin('year_day',year_day_dyn)
 ! Omega
 ! omeg=2.*pi/86400.
-omeg=2.*pi/daysec*(1./daylen+1./year_day)
+omeg=2.*pi/daysec*(1./daylen+1./year_day_dyn)
 CALL getin('omeg',omeg)