Changeset 3095 for LMDZ6/trunk/libf

Timestamp:

Dec 1, 2017, 5:07:32 PM (7 years ago)

Author:

Laurent Fairhead

Message:

Adding some further variables for the CMIP6 Data Request v18
LF

Location:

LMDZ6/trunk/libf/phylmd

Files:

• phys_output_ctrlout_mod.F90 (modified) (2 diffs)
• phys_output_write_mod.F90 (modified) (4 diffs)

LMDZ6/trunk/libf/phylmd/phys_output_ctrlout_mod.F90

@@ -330 +330 @@
     'ndayrain', 'Number of dayrain(liq+sol)', '-', &
       (/ "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)", "inst(X)" /))
+  TYPE(ctrl_out), SAVE :: o_rain_fall = ctrl_out((/ 1, 1, 1, 10, 5, 10, 11, 11, 11, 11/), &
+    'rain_fall', 'Precip Totale liq', 'kg/(s*m2)', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_precip = ctrl_out((/ 1, 1, 1, 10, 5, 10, 11, 11, 11, 11/), &
     'precip', 'Precip Totale liq+sol', 'kg/(s*m2)', (/ ('', i=1, 10) /))
@@ -477 +479 @@
   TYPE(ctrl_out), SAVE :: o_fqfonte = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'fqfonte', 'Land ice melt', 'kg/m2/s', (/ ('', i=1, 10) /))
+  TYPE(ctrl_out), SAVE :: o_mrroli = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11, 11/), &
+    'mrroli', 'Runoff flux over land ice', 'kg/m2/s', (/ ('', i=1, 10) /))
   TYPE(ctrl_out), SAVE :: o_runofflic = ctrl_out((/ 1, 10, 10, 10, 10, 10, 11, 11, 11, 11/), &
     'runofflic', 'Land ice melt to ocean', 'kg/m2/s', (/ ('', i=1, 10) /))

LMDZ6/trunk/libf/phylmd/phys_output_write_mod.F90

@@ -40 +40 @@
          o_wind10m, o_wind10max, o_gusts, o_sicf, &
          o_psol, o_mass, o_qsurf, o_qsol, &
-         o_precip, o_ndayrain, o_plul, o_pluc, o_plun, &
+         o_precip, o_rain_fall, o_ndayrain, o_plul, o_pluc, o_plun, &
          o_snow, o_msnow, o_fsnow, o_evap, o_ep,o_epmax_diag, & ! epmax_cape
          o_tops, o_tops0, o_topl, o_topl0, &
@@ -54 +54 @@
          o_bils_ec,o_bils_ech, o_bils_tke, o_bils_kinetic, &
          o_bils_latent, o_bils_enthalp, o_sens, &
-         o_fder, o_ffonte, o_fqcalving, o_fqfonte, o_runofflic, &
+         o_fder, o_ffonte, o_fqcalving, o_fqfonte, o_mrroli, o_runofflic, &
          o_taux, o_tauy, o_snowsrf, o_qsnow, &
          o_snowhgt, o_toice, o_sissnow, o_runoff, &
@@ -668 +668 @@
 
        CALL histwrite_phy(o_precip, zx_tmp_fi2d)
+       CALL histwrite_phy(o_rain_fall, rain_fall)
        CALL histwrite_phy(o_ndayrain, nday_rain)
 
@@ -799 +800 @@
        CALL histwrite_phy(o_fqcalving, zxfqcalving)
        CALL histwrite_phy(o_fqfonte, zxfqfonte)
+       IF (vars_defined) THEN
+          zx_tmp_fi2d(1:klon)=(zxfqfonte(1:klon)+rain_fall(1:klon))*pctsrf(1:klon,is_lic)
+       ENDIF
+       CALL histwrite_phy(o_mrroli, zx_tmp_fi2d)
        CALL histwrite_phy(o_runofflic, zxrunofflic)
        IF (vars_defined) THEN