Changeset 3459 for LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

Timestamp:

Jan 31, 2019, 8:22:47 PM (5 years ago)

Author:

oboucher

Message:

Changing hard-coded value of 28.97 g/mol by RMD physical constant defined in suphel.F90
As rmd = 28.9644, this involves a lack of numerical convergence with previous commit.

File:

• LMDZ6/trunk/libf/phylmd/conf_phys_m.F90 (modified) (10 diffs)

LMDZ6/trunk/libf/phylmd/conf_phys_m.F90

@@ -596 +596 @@
     ! RCO2 = 5.286789092164308E-04
     !ancienne valeur
-    RCO2_omp = co2_ppm_omp * 1.0e-06  * 44.011/28.97 ! pour co2_ppm=348.
+    RCO2_omp = co2_ppm_omp * 1.0e-06 * RMCO2 / RMD ! pour co2_ppm=348.
 
     !  CALL getin('RCO2', RCO2)
@@ -616 +616 @@
     CALL getin('CH4_ppb', zzz)
     CH4_ppb_omp = zzz
-    RCH4_omp = CH4_ppb_omp * 1.0E-09 * 16.043/28.97
+    RCH4_omp = CH4_ppb_omp * 1.0E-09 * RMCH4 / RMD
     !
     !Config Key  = RN2O
@@ -634 +634 @@
     CALL getin('N2O_ppb', zzz)
     N2O_ppb_omp = zzz
-    RN2O_omp = N2O_ppb_omp * 1.0E-09 * 44.013/28.97
+    RN2O_omp = N2O_ppb_omp * 1.0E-09 * RMN2O / RMD
     !
     !Config Key  = RCFC11
@@ -646 +646 @@
     CALL getin('CFC11_ppt',zzz)
     CFC11_ppt_omp = zzz
-    RCFC11_omp=CFC11_ppt_omp* 1.0E-12 * 137.3686/28.97
+    RCFC11_omp=CFC11_ppt_omp* 1.0E-12 * RMCFC11 / RMD
     ! RCFC11 = 1.327690990680013E-09
     !OK CALL getin('RCFC11', RCFC11)
@@ -660 +660 @@
     CALL getin('CFC12_ppt',zzz)
     CFC12_ppt_omp = zzz
-    RCFC12_omp = CFC12_ppt_omp * 1.0E-12 * 120.9140/28.97
+    RCFC12_omp = CFC12_ppt_omp * 1.0E-12 * RMCFC12 / RMD
     ! RCFC12 = 2.020102726958923E-09
     !OK CALL getin('RCFC12', RCFC12)
@@ -680 +680 @@
     !Config Help = 
     !               
-    RCO2_per_omp = co2_ppm_per_omp * 1.0e-06  * 44.011/28.97
+    RCO2_per_omp = co2_ppm_per_omp * 1.0e-06 * RMCO2 / RMD
 
     !Config Key  = ok_4xCO2atm
@@ -695 +695 @@
     CALL getin('CH4_ppb_per', zzz)
     CH4_ppb_per_omp = zzz
-    RCH4_per_omp = CH4_ppb_per_omp * 1.0E-09 * 16.043/28.97
+    RCH4_per_omp = CH4_ppb_per_omp * 1.0E-09 * RMCH4 / RMD
     !
     !Config Key  = RN2O_per
@@ -705 +705 @@
     CALL getin('N2O_ppb_per', zzz)
     N2O_ppb_per_omp = zzz
-    RN2O_per_omp = N2O_ppb_per_omp * 1.0E-09 * 44.013/28.97
+    RN2O_per_omp = N2O_ppb_per_omp * 1.0E-09 * RMN2O / RMD
     !
     !Config Key  = RCFC11_per
@@ -715 +715 @@
     CALL getin('CFC11_ppt_per',zzz)
     CFC11_ppt_per_omp = zzz
-    RCFC11_per_omp=CFC11_ppt_per_omp* 1.0E-12 * 137.3686/28.97
+    RCFC11_per_omp=CFC11_ppt_per_omp* 1.0E-12 * RMCFC11 / RMD
     !
     !Config Key  = RCFC12_per
@@ -725 +725 @@
     CALL getin('CFC12_ppt_per',zzz)
     CFC12_ppt_per_omp = zzz
-    RCFC12_per_omp = CFC12_ppt_per_omp * 1.0E-12 * 120.9140/28.97
+    RCFC12_per_omp = CFC12_ppt_per_omp * 1.0E-12 * RMCFC12 / RMD
     !ajout CFMIP end