From 34eb4c1937032a4f18c1b6d756d2d6e537e326ed Mon Sep 17 00:00:00 2001
From: Yanchun He <1725351+YanchunHe@users.noreply.github.com>
Date: Fri, 16 Jun 2023 16:16:59 +0200
Subject: [PATCH] Numerous fixes to fields (#340)

* correct variable namelist to include 3hourly precipation in mean file (h4) instead of instant file (h5)

issue #41

* fix od550ear

issue #324

* fix rsutaf and rsutcsaf

issue #312
---
 namelists/var_CMIP6_NorESM2_default.nml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/namelists/var_CMIP6_NorESM2_default.nml b/namelists/var_CMIP6_NorESM2_default.nml
index 1dc9af3f..c17a8fe0 100644
--- a/namelists/var_CMIP6_NorESM2_default.nml
+++ b/namelists/var_CMIP6_NorESM2_default.nml
@@ -516,8 +516,8 @@
                  'reffclwtop   ','REFFCLWMODIS/CLWMODIS     ','Dfield2   ',
                  'rlutaf       ','FLNT_DRF                  ','positiveup',
                  'rlutcsaf     ','FLNTCDRF                  ','positiveup',
-                 'rsutaf       ','FSNT_DRF                  ','positiveup',
-                 'rsutcsaf     ','FSNTCDRF                  ','positiveup',
+                 'rsutaf       ','FSNT_DRF-FSNT             ','positiveup',
+                 'rsutcsaf     ','FSNTCDRF-FSNTC            ','positiveup',
                  'so2          ','SO2                       ','          ',
                  'ua           ','U                         ','          ',
                  'va           ','V                         ','          ',
@@ -575,7 +575,7 @@
                  'fFireNat           ','COL_FIRE_CLOSS                              ','kg m-2 s-1',
                  'fHarvestToProduct  ','WOOD_HARVESTC                               ','kg m-2 s-1',
                  'fLitterFire        ','LITFIRE                                     ','kg m-2 s-1',
-                 'fLuc               ','LAND_USE_FLUX                               ','kg m-2 s-1;positiveup',
+                 'fLuc               ','DWT_CONV_CFLUX+TOT_WOODPRODC_LOSS           ','kg m-2 s-1;positiveup',
                  'fN2O               ','F_N2O_DENIT+F_N2O_NIT                       ','kg m-2 s-1;positiveup',
                  'fNOx               ','SMIN_NO3_LEACHED+SMIN_NO3_RUNOFF            ','kg m-2 s-1;positiveup',
                  'fNProduct          ','DWT_WOODPRODN_GAIN+DWT_CROPPROD1N_GAIN      ','kg m-2 s-1',
@@ -731,7 +731,7 @@
                  'evspsblsoi   ','QSOIL                 ','          ',
                  'evspsblveg   ','QVEGE                 ','          ',
                  'fFire        ','COL_FIRE_CLOSS        ','kg m-2 s-1;positiveup',
-                 'fHarvest     ','WOOD_HARVESTC         ','kg m-2 s-1;positiveup',
+                 'fHarvest     ','CROPPROD1C_LOSS       ','kg m-2 s-1;positiveup',
                  'fLitterSoil  ','LITR1C_TO_SOIL1C+LITR2C_TO_SOIL1C+LITR3C_TO_SOIL2C','kg m-2 s-1',
                  'fVegLitter   ','LITFALL               ','kg m-2 s-1',
                  'gpp          ','GPP                   ','kg m-2 s-1',
@@ -854,7 +854,7 @@ tAERday        = 'CMIP6_AERday.json',
 rAERday        = 1000000,
 vAERday        =
                  'cod       ','TAUTMODIS/CLTMODIS','Dfield2',
-                 'od550aer  ','DOD550/DAYFOC','unitless;dayfoc',
+                 'od550aer  ','DOD550       ','unitless;dayfoc',
                  'ua10      ','U010         ','         ',
                  'va10      ','V010         ','         ',
                  'zg10      ','Z010         ','         ',
@@ -982,8 +982,8 @@ vCFday         =
                  'ua          ','U             ','          ',
                  'va          ','V             ','          ',
 ! not available in output, thus not tested
-!                'bs550aer    ','BS550AER/DAYFOC','DAYFOC   ',
-!                'ec550aer    ','EC550AER/DAYFOC','DAYFOC   ',
+!                'bs550aer    ','BS550AER      ','DAYFOC   ',
+!                'ec550aer    ','EC550AER      ','DAYFOC   ',
 /
 
 &table_6hrplev
@@ -1036,6 +1036,9 @@ vCFday         =
                  'huss      ','QREFHT            ','          ',
                  'mrro      ','QRUNOFF           ','          ',
                  'mrsos     ','SOILWATER_10CM    ','          ',
+                 'pr        ','PRECT             ','kg m-2 s-1',
+                 'prc       ','PRECC             ','kg m-2 s-1',
+                 'prsn      ','PRECSC+PRECSL     ','kg m-2 s-1',
                  'ps        ','PS                ','          ',
                  'tas       ','TREFHT            ','          ',
                  'tslsi     ','TSA               ','          ',
@@ -1049,9 +1052,6 @@ vCFday         =
                  'clt       ','CLDTOT            ','unitless  ',
                  'hfls      ','LHFLX             ','positiveup',
                  'hfss      ','SHFLX             ','positiveup',
-                 'pr        ','PRECT             ','kg m-2 s-1',
-                 'prc       ','PRECC             ','kg m-2 s-1',
-                 'prsn      ','PRECSC+PRECSL     ','kg m-2 s-1',
                  'rlds      ','FLDS              ','positivedo',
                  'rldscs    ','FLDSC             ','positivedo',
                  'rlus      ','FLDS+FLNS         ','positiveup',
@@ -1098,7 +1098,7 @@ vCFday         =
 !                'rsdscsaf      ','FSDS_DRF        ','positivedo   ',
 !                'rsucsaf       ','FUSCDRF         ','positiveup   ',
 !                'rsuscsaf      ','FSDSCDRF-FSNSCDRF','positiveup  ',
-!                'rsutcsaf      ','FSNTCDRF        ','positiveup   ',
+!                'rsutcsaf      ','FSNTCDRF-FSNTC  ','positiveup   ',
 !                'cfadDbze94    ','CFAD_DBZE94_CS  ','             ',
 !                'cfadLidarsr532','CFAD_SR532_CAL  ','             ',
 !                'clcalipso     ','CLD_CAL         ','             ',