Changeset 4001

Timestamp:

Nov 8, 2021, 9:24:56 AM (3 years ago)

Author:

oboucher

Message:

Adding missing units in print out of physical constants

File:

• LMDZ6/trunk/libf/phylmd/suphel.F90 (modified) (5 diffs)

LMDZ6/trunk/libf/phylmd/suphel.F90

@@ -134 +134 @@
   retv = rv/rd - 1.
   WRITE (UNIT=6, FMT='('' *** Thermodynamic, gas     ***'')')
-  WRITE (UNIT=6, FMT='('' Perfect gas  = '',e13.7)') r
-  WRITE (UNIT=6, FMT='('' Dry air mass = '',e13.7)') rmd
-  WRITE (UNIT=6, FMT='('' Ozone   mass = '',e13.7)') rmo3
-  WRITE (UNIT=6, FMT='('' CO2     mass = '',e13.7)') rmco2
-  WRITE (UNIT=6, FMT='('' C       mass = '',e13.7)') rmc
-  WRITE (UNIT=6, FMT='('' CH4     mass = '',e13.7)') rmch4
-  WRITE (UNIT=6, FMT='('' N2O     mass = '',e13.7)') rmn2o
-  WRITE (UNIT=6, FMT='('' CFC11   mass = '',e13.7)') rmcfc11
-  WRITE (UNIT=6, FMT='('' CFC12   mass = '',e13.7)') rmcfc12
-  WRITE (UNIT=6, FMT='('' Vapour  mass = '',e13.7)') rmv
-  WRITE (UNIT=6, FMT='('' Dry air cst. = '',e13.7)') rd
-  WRITE (UNIT=6, FMT='('' Vapour  cst. = '',e13.7)') rv
-  WRITE (UNIT=6, FMT='(''         Cpd  = '',e13.7)') rcpd
-  WRITE (UNIT=6, FMT='(''         Cvd  = '',e13.7)') rcvd
-  WRITE (UNIT=6, FMT='(''         Cpv  = '',e13.7)') rcpv
-  WRITE (UNIT=6, FMT='(''         Cvv  = '',e13.7)') rcvv
+  WRITE (UNIT=6, FMT='('' Perfect gas  = '',e13.7,'' J mol-1 K-1'')') r
+  WRITE (UNIT=6, FMT='('' Dry air mass = '',e13.7,'' g mol-1'')') rmd
+  WRITE (UNIT=6, FMT='('' Ozone   mass = '',e13.7,'' g mol-1'')') rmo3
+  WRITE (UNIT=6, FMT='('' CO2     mass = '',e13.7,'' g mol-1'')') rmco2
+  WRITE (UNIT=6, FMT='('' C       mass = '',e13.7,'' g mol-1'')') rmc
+  WRITE (UNIT=6, FMT='('' CH4     mass = '',e13.7,'' g mol-1'')') rmch4
+  WRITE (UNIT=6, FMT='('' N2O     mass = '',e13.7,'' g mol-1'')') rmn2o
+  WRITE (UNIT=6, FMT='('' CFC11   mass = '',e13.7,'' g mol-1'')') rmcfc11
+  WRITE (UNIT=6, FMT='('' CFC12   mass = '',e13.7,'' g mol-1'')') rmcfc12
+  WRITE (UNIT=6, FMT='('' Vapour  mass = '',e13.7,'' g mol-1'')') rmv
+  WRITE (UNIT=6, FMT='('' Dry air cst. = '',e13.7,'' J K-1 kg-1'')') rd
+  WRITE (UNIT=6, FMT='('' Vapour  cst. = '',e13.7,'' J K-1 kg-1'')') rv
+  WRITE (UNIT=6, FMT='(''         Cpd  = '',e13.7,'' J K-1 kg-1'')') rcpd
+  WRITE (UNIT=6, FMT='(''         Cvd  = '',e13.7,'' J K-1 kg-1'')') rcvd
+  WRITE (UNIT=6, FMT='(''         Cpv  = '',e13.7,'' J K-1 kg-1'')') rcpv
+  WRITE (UNIT=6, FMT='(''         Cvv  = '',e13.7,'' J K-1 kg-1'')') rcvv
   WRITE (UNIT=6, FMT='(''      Rd/Cpd  = '',e13.7)') rkappa
   WRITE (UNIT=6, FMT='(''     Rv/Rd-1  = '',e13.7)') retv
@@ -161 +161 @@
   rcw = rcpv
   WRITE (UNIT=6, FMT='('' *** Thermodynamic, liquid  ***'')')
-  WRITE (UNIT=6, FMT='(''         Cw   = '',E13.7)') rcw
+  WRITE (UNIT=6, FMT='(''         Cw   = '',E13.7,'' J K-1 kg-1'')') rcw
 
   ! ----------------------------------------------------------------
@@ -170 +170 @@
   rcs = rcpv
   WRITE (UNIT=6, FMT='('' *** thermodynamic, solid   ***'')')
-  WRITE (UNIT=6, FMT='(''         Cs   = '',E13.7)') rcs
+  WRITE (UNIT=6, FMT='(''         Cs   = '',E13.7,'' J K-1 kg-1'')') rcs
 
   ! ----------------------------------------------------------------
@@ -183 +183 @@
   ratm = 100000.
   WRITE (UNIT=6, FMT='('' *** Thermodynamic, trans.  ***'')')
-  WRITE (UNIT=6, FMT='('' Fusion point  = '',E13.7)') rtt
-  WRITE (UNIT=6, FMT='(''        RLvTt  = '',E13.7)') rlvtt
-  WRITE (UNIT=6, FMT='(''        RLsTt  = '',E13.7)') rlstt
-  WRITE (UNIT=6, FMT='(''        RLMlt  = '',E13.7)') rlmlt
-  WRITE (UNIT=6, FMT='('' Normal press. = '',E13.7)') ratm
+  WRITE (UNIT=6, FMT='('' Fusion point  = '',E13.7,'' K'')') rtt
+  WRITE (UNIT=6, FMT='(''        RLvTt  = '',E13.7,'' J kg-1'')') rlvtt
+  WRITE (UNIT=6, FMT='(''        RLsTt  = '',E13.7,'' J kg-1'')') rlstt
+  WRITE (UNIT=6, FMT='(''        RLMlt  = '',E13.7,'' J kg-1'')') rlmlt
+  WRITE (UNIT=6, FMT='('' Normal press. = '',E13.7,'' Pa'')') ratm
   WRITE (UNIT=6, FMT='('' Latent heat :  '')')
 
@@ -195 +195 @@
   ! --------------------------
 
-  restt = 611.14
+  restt = 611.14   !--saturation water vapour pressure at triple point (Pa)
   rgamw = (rcw-rcpv)/rv
   rbetw = rlvtt/rv + rgamw*rtt