Index: /trunk/LMDZ.GENERIC/changelog.txt
===================================================================
--- /trunk/LMDZ.GENERIC/changelog.txt	(revision 3654)
+++ /trunk/LMDZ.GENERIC/changelog.txt	(revision 3655)
@@ -2012,2 +2012,7 @@
 If you want add another molecule, you just need to add these 2 parameters and the references (please).
 For water, the rayleigh scattering now depends on temperature and pressure.
+
+== 27/02/2025 == GM
+
+Water: changing only the name of the 'RV' variable to 'RW' 
+to avoid conflicts with the future thermodynamics module.
Index: /trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90
===================================================================
--- /trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90	(revision 3654)
+++ /trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90	(revision 3655)
@@ -18,5 +18,5 @@
       use ioipsl_getin_p_mod, only: getin_p
       use radinc_h, only : L_NSPECTI,L_NSPECTV,naerkind, corrkdir, banddir
-      use watercommon_h, only : RLVTT, Psat_water,epsi,su_watercycle, RV, T_h2o_ice_liq
+      use watercommon_h, only : RLVTT, Psat_water,epsi,su_watercycle, RW, T_h2o_ice_liq
       use generic_cloud_common_h, only : epsi_generic, Psat_generic
       use thermcell_mod, only: init_thermcell_mod
@@ -784,5 +784,5 @@
 !        ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
          if (calltherm) then
-            CALL init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
+            CALL init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RW)
          endif
 
Index: /trunk/LMDZ.GENERIC/libf/phystd/rain.F90
===================================================================
--- /trunk/LMDZ.GENERIC/libf/phystd/rain.F90	(revision 3654)
+++ /trunk/LMDZ.GENERIC/libf/phystd/rain.F90	(revision 3655)
@@ -3,5 +3,5 @@
 
   use ioipsl_getin_p_mod, only: getin_p
-  use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds, RLVTT, RCPD, RCPV, RV, RVTMP2,Psat_water,Tsat_water,rhowater
+  use watercommon_h, only: T_h2O_ice_liq,T_h2O_ice_clouds, RLVTT, RCPD, RCPV, RW, RVTMP2,Psat_water,Tsat_water,rhowater
   use radii_mod, only: h2o_cloudrad
   USE tracer_h, only: igcm_h2o_vap, igcm_h2o_ice
Index: /trunk/LMDZ.GENERIC/libf/phystd/thermcell_mod.F90
===================================================================
--- /trunk/LMDZ.GENERIC/libf/phystd/thermcell_mod.F90	(revision 3654)
+++ /trunk/LMDZ.GENERIC/libf/phystd/thermcell_mod.F90	(revision 3655)
@@ -51,5 +51,5 @@
       CONTAINS
       
-      SUBROUTINE init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RV)
+      SUBROUTINE init_thermcell_mod(g, rcp, r, pi, T_h2o_ice_liq, RW)
          
          USE ioipsl_getin_p_mod, ONLY: getin_p
@@ -62,5 +62,5 @@
          REAL pi
          REAL T_h2o_ice_liq
-         REAL RV
+         REAL RW
          
          RTT = T_h2o_ice_liq
Index: /trunk/LMDZ.GENERIC/libf/phystd/watercommon_h.F90
===================================================================
--- /trunk/LMDZ.GENERIC/libf/phystd/watercommon_h.F90	(revision 3654)
+++ /trunk/LMDZ.GENERIC/libf/phystd/watercommon_h.F90	(revision 3655)
@@ -18,8 +18,8 @@
       real, parameter :: mx_eau_sol = 150 ! mass of water (kg/m^2)
 
-      real, save :: epsi, RCPD, RCPV, RV, RVTMP2
+      real, save :: epsi, RCPD, RCPV, RW, RVTMP2
       real, save :: RETV
       real, save :: RLvCp
-!$OMP THREADPRIVATE(epsi,RCPD,RCPV,RV,RVTMP2)
+!$OMP THREADPRIVATE(epsi,RCPD,RCPV,RW,RVTMP2)
       
       contains
@@ -48,6 +48,6 @@
       RCPD   = cpp 
 
-      !RV = 1000.*R/mH2O
-      RV = 1000.*8.314/mH2O ! caution! R is R/mugaz already!
+      !RW = 1000.*R/mH2O
+      RW = 1000.*8.314/mH2O ! caution! R is R/mugaz already!
 
       RCPV   = 1.88e3 ! specific heat capacity of water vapor at 350K
@@ -56,5 +56,5 @@
       
 ! AB : initializations added for the thermal plume model
-      RETV = RV / r - 1.
+      RETV = RW / r - 1.
       RLvCp = RLVTT / RCPD