diff --git a/Externals_CLM.cfg b/Externals_CLM.cfg index 3959ca1ce3..0e7a7bfe4b 100644 --- a/Externals_CLM.cfg +++ b/Externals_CLM.cfg @@ -2,9 +2,8 @@ local_path = src/fates protocol = git repo_url = https://github.com/NGEET/fates -tag = sci.1.50.1_api.18.0.0 +tag = sci.1.51.0_api.19.0.0 required = True [externals_description] schema_version = 1.0.0 - diff --git a/cime_config/testdefs/ExpectedTestFails.xml b/cime_config/testdefs/ExpectedTestFails.xml index 0fc39dd546..010ca6681d 100644 --- a/cime_config/testdefs/ExpectedTestFails.xml +++ b/cime_config/testdefs/ExpectedTestFails.xml @@ -67,8 +67,8 @@ - - + + FAIL #1485 diff --git a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm index cbf6c1b7c4..ff43532ef5 100644 --- a/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/Fates/user_nl_clm @@ -3,92 +3,30 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .true. fates_spitfire_mode = 1 -hist_fincl1 = 'ED_NPATCHES', -'ED_NCOHORTS', -'TRIMMING', -'AREA_PLANT', -'AREA_TREES', -'SITE_COLD_STATUS', -'SITE_DROUGHT_STATUS', -'SITE_GDD', -'SITE_NCHILLDAYS', -'SITE_NCOLDDAYS', -'SITE_DAYSINCE_COLDLEAFOFF', -'SITE_DAYSINCE_COLDLEAFON', -'SITE_DAYSINCE_DROUGHTLEAFOFF', -'SITE_DAYSINCE_DROUGHTLEAFON', -'SITE_MEANLIQVOL_DROUGHTPHEN', -'CANOPY_SPREAD', -'FIRE_NESTEROV_INDEX', -'FIRE_IGNITIONS', -'FIRE_FDI', -'FIRE_ROS', -'FIRE_ROS_AREA_PRODUCT', -'EFFECT_WSPEED', -'FIRE_TFC_ROS', -'FIRE_TFC_ROS_AREA_PRODUCT', -'FIRE_INTENSITY', -'FIRE_INTENSITY_AREA_PRODUCT', -'FIRE_AREA', -'FIRE_FUEL_MEF', -'FIRE_FUEL_BULKD', -'FIRE_FUEL_EFF_MOIST', -'FIRE_FUEL_SAV', -'SUM_FUEL', -'LITTER_IN', -'LITTER_OUT', -'SEED_BANK', -'SEEDS_IN', -'STOREC', -'TOTVEGC', -'SAPWC', -'LEAFC', -'FNRTC', -'REPROC', -'CEFFLUX', -'ED_bstore', -'ED_bdead', -'ED_balive', -'ED_bleaf', -'ED_bsapwood', -'ED_bfineroot', -'ED_biomass', -'AGB', -'BIOMASS_CANOPY', -'BIOMASS_UNDERSTORY', -'PRIMARYLAND_PATCHFUSION_ERROR', -'DISTURBANCE_RATE_P2P', -'DISTURBANCE_RATE_P2S', -'DISTURBANCE_RATE_S2S', -'DISTURBANCE_RATE_FIRE', -'DISTURBANCE_RATE_LOGGING', -'DISTURBANCE_RATE_TREEFALL', -'DISTURBANCE_RATE_POTENTIAL', -'HARVEST_CARBON_FLUX', -'C_STOMATA', -'C_LBLAYER', -'NPP', -'GPP', -'AR', -'GROWTH_RESP', -'MAINT_RESP', -'GPP_CANOPY', -'AR_CANOPY', -'GPP_UNDERSTORY', -'AR_UNDERSTORY', -'DEMOTION_CARBONFLUX', -'PROMOTION_CARBONFLUX', -'MORTALITY_CARBONFLUX_CANOPY', -'MORTALITY_CARBONFLUX_UNDERSTORY', -'NEP', -'FATES_HR', -'Fire_Closs', -'FIRE_FLUX', -'CBALANCE_ERROR_FATES', -'ERROR_FATES', -'NPP_LEAF', -'NPP_SEED', -'NPP_STEM', -'NPP_FROOT', -'NPP_CROOT', -'NPP_STOR' \ No newline at end of file +hist_fincl1 = 'FATES_NCOHORTS', 'FATES_TRIMMING', 'FATES_AREA_PLANTS', +'FATES_AREA_TREES', 'FATES_COLD_STATUS', 'FATES_DROUGHT_STATUS', 'FATES_GDD', +'FATES_NCHILLDAYS', 'FATES_NCOLDDAYS', 'FATES_DAYSINCE_COLDLEAFOFF', +'FATES_DAYSINCE_COLDLEAFON', 'FATES_DAYSINCE_DROUGHTLEAFOFF', +'FATES_DAYSINCE_DROUGHTLEAFON', 'FATES_MEANLIQVOL_DROUGHTPHEN', +'FATES_CANOPY_SPREAD', 'FATES_NESTEROV_INDEX', 'FATES_IGNITIONS', 'FATES_FDI', +'FATES_ROS','FATES_EFFECT_WSPEED', 'FATES_FUELCONSUMED', 'FATES_FIRE_INTENSITY', +'FATES_FIRE_INTENSITY_BURNFRAC', 'FATES_BURNFRAC', 'FATES_FUEL_MEF', +'FATES_FUEL_BULKD', 'FATES_FUEL_EFF_MOIST', 'FATES_FUEL_SAV', +'FATES_FUEL_AMOUNT', 'FATES_LITTER_IN', 'FATES_LITTER_OUT', +'FATES_SEED_BANK', 'FATES_SEEDS_IN', 'FATES_STOREC', 'FATES_VEGC', +'FATES_SAPWOODC', 'FATES_LEAFC', 'FATES_FROOTC', 'FATES_REPROC', +'FATES_CEFFLUX', 'FATES_STRUCTC', 'FATES_NONSTRUCTC', 'FATES_VEGC_ABOVEGROUND', +'FATES_CANOPY_VEGC', 'FATES_USTORY_VEGC', 'FATES_PRIMARY_PATCHFUSION_ERR', +'FATES_DISTURBANCE_RATE_P2P', 'FATES_DISTURBANCE_RATE_P2S', +'FATES_DISTURBANCE_RATE_S2S', 'FATES_DISTURBANCE_RATE_FIRE', +'FATES_DISTURBANCE_RATE_LOGGING', 'FATES_DISTURBANCE_RATE_TREEFALL', +'FATES_DISTURBANCE_RATE_POTENTIAL', 'FATES_HARVEST_CARBON_FLUX', +'FATES_STOMATAL_COND', 'FATES_LBLAYER_COND', 'FATES_NPP', 'FATES_GPP', +'FATES_AUTORESP', 'FATES_GROWTH_RESP', 'FATES_MAINT_RESP', 'FATES_GPP_CANOPY', +'FATES_AUTORESP_CANOPY', 'FATES_GPP_UNDERSTORY', 'FATES_AUTORESP_UNDERSTORY', +'FATES_DEMOTION_CARBONFLUX', 'FATES_PROMOTION_CARBONFLUX', +'FATES_MORTALITY_CFLUX_CANOPY', 'FATES_MORTALITY_CFLUX_UNDERSTORY', +'FATES_NEP', 'FATES_HET_RESP', 'FATES_FIRE_CLOSS', 'FATES_FIRE_FLUX_EL', +'FATES_CBALANCE_ERROR', 'FATES_ERROR_EL', 'FATES_LEAF_ALLOC', +'FATES_SEED_ALLOC', 'FATES_STEM_ALLOC', 'FATES_FROOT_ALLOC', +'FATES_CROOT_ALLOC', 'FATES_STORE_ALLOC' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm index cd1daa4eea..b7d33c87d2 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefAllVars/user_nl_clm @@ -3,43 +3,71 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .false. fates_spitfire_mode = 1 -hist_fincl1 = 'PFTcrownarea','PFTcanopycrownarea','NCL_BY_AGE','NPATCH_BY_AGE', -'BIOMASS_BY_AGE','SECONDARY_FOREST_FRACTION','WOOD_PRODUCT','SECONDARY_FOREST_BIOMASS', -'SECONDARY_AREA_AGE_ANTHRO_DIST','SECONDARY_AREA_PATCH_AGE_DIST','C_STOMATA_BY_AGE','C_LBLAYER_BY_AGE', -'NPP_BY_AGE','GPP_BY_AGE','PARSUN_Z_CNLF','PARSHA_Z_CNLF', -'PARSUN_Z_CNLFPFT','PARSHA_Z_CNLFPFT','PARSUN_Z_CAN','PARSHA_Z_CAN', -'LAISUN_Z_CNLF','LAISHA_Z_CNLF','LAISUN_Z_CNLFPFT','LAISHA_Z_CNLFPFT', -'LAISUN_TOP_CAN','LAISHA_TOP_CAN','FABD_SUN_CNLFPFT','FABD_SHA_CNLFPFT', -'FABI_SUN_CNLFPFT','FABI_SHA_CNLFPFT','FABD_SUN_CNLF','FABD_SHA_CNLF', -'FABI_SUN_CNLF','FABI_SHA_CNLF','PARPROF_DIR_CNLFPFT','PARPROF_DIF_CNLFPFT', -'PARPROF_DIR_CNLF','PARPROF_DIF_CNLF','FABD_SUN_TOPLF_BYCANLAYER', -'FABD_SHA_TOPLF_BYCANLAYER','FABI_SUN_TOPLF_BYCANLAYER','FABI_SHA_TOPLF_BYCANLAYER', -'NET_C_UPTAKE_CNLF','CROWNAREA_CNLF','NPLANT_CANOPY_SCAG','NPLANT_UNDERSTORY_SCAG', -'DDBH_CANOPY_SCAG','DDBH_UNDERSTORY_SCAG','MORTALITY_CANOPY_SCAG','MORTALITY_UNDERSTORY_SCAG', -'NPLANT_SCAGPFT','NPP_AGEPFT','BIOMASS_AGEPFT','GPP_SCPF','GPP_CANOPY_SCPF', -'AR_CANOPY_SCPF','GPP_UNDERSTORY_SCPF','AR_UNDERSTORY_SCPF','NPP_SCPF', -'NPP_LEAF_SCPF','NPP_SEED_SCPF','NPP_FNRT_SCPF','NPP_BGSW_SCPF','NPP_BGDW_SCPF','NPP_AGSW_SCPF', -'NPP_AGDW_SCPF','NPP_STOR_SCPF','DDBH_SCPF','GROWTHFLUX_SCPF','GROWTHFLUX_FUSION_SCPF', -'DDBH_CANOPY_SCPF','DDBH_UNDERSTORY_SCPF','BA_SCPF','AGB_SCPF','NPLANT_SCPF', -'NPLANT_CAPF','M1_SCPF','M2_SCPF','M3_SCPF','M4_SCPF','M5_SCPF','CROWNFIREMORT_SCPF','CAMBIALFIREMORT_SCPF', -'M6_SCPF','M7_SCPF','M8_SCPF','M9_SCPF','M10_SCPF', -'M10_CAPF','MORTALITY_CANOPY_SCPF','BSTOR_CANOPY_SCPF','BLEAF_CANOPY_SCPF', -'NPLANT_CANOPY_SCPF','MORTALITY_UNDERSTORY_SCPF','BSTOR_UNDERSTORY_SCPF','BLEAF_UNDERSTORY_SCPF', -'NPLANT_UNDERSTORY_SCPF','CWD_AG_CWDSC','CWD_BG_CWDSC','CWD_AG_IN_CWDSC', -'CWD_BG_IN_CWDSC','CWD_AG_OUT_CWDSC','CWD_BG_OUT_CWDSC','AR_SCPF','AR_GROW_SCPF', -'AR_MAINT_SCPF','AR_DARKM_SCPF','AR_AGSAPM_SCPF','AR_CROOTM_SCPF','AR_FROOTM_SCPF', -'YESTERDAYCANLEV_CANOPY_SCLS','YESTERDAYCANLEV_UNDERSTORY_SCLS', -'BIOMASS_SCLS','DEMOTION_RATE_SCLS','PROMOTION_RATE_SCLS','SAI_CANOPY_SCLS','SAI_UNDERSTORY_SCLS', -'CARBON_BALANCE_CANOPY_SCLS','CARBON_BALANCE_UNDERSTORY_SCLS','TRIMMING_CANOPY_SCLS', -'TRIMMING_UNDERSTORY_SCLS','CROWN_AREA_CANOPY_SCLS','CROWN_AREA_UNDERSTORY_SCLS', -'LEAF_MD_CANOPY_SCLS','ROOT_MD_CANOPY_SCLS','BSTORE_MD_CANOPY_SCLS','BDEAD_MD_CANOPY_SCLS', -'BSW_MD_CANOPY_SCLS','SEED_PROD_CANOPY_SCLS','NPP_LEAF_CANOPY_SCLS','NPP_FROOT_CANOPY_SCLS', -'NPP_BSW_CANOPY_SCLS','NPP_BDEAD_CANOPY_SCLS','NPP_BSEED_CANOPY_SCLS', -'NPP_STORE_CANOPY_SCLS','RDARK_CANOPY_SCLS', -'LIVESTEM_MR_CANOPY_SCLS','LIVECROOT_MR_CANOPY_SCLS','FROOT_MR_CANOPY_SCLS','RESP_G_CANOPY_SCLS', -'RESP_M_CANOPY_SCLS','LEAF_MD_UNDERSTORY_SCLS','ROOT_MD_UNDERSTORY_SCLS','BSTORE_MD_UNDERSTORY_SCLS', -'BDEAD_MD_UNDERSTORY_SCLS','BSW_MD_UNDERSTORY_SCLS','SEED_PROD_UNDERSTORY_SCLS','NPP_LEAF_UNDERSTORY_SCLS', -'NPP_FROOT_UNDERSTORY_SCLS','NPP_BSW_UNDERSTORY_SCLS','NPP_BDEAD_UNDERSTORY_SCLS','NPP_BSEED_UNDERSTORY_SCLS', -'NPP_STORE_UNDERSTORY_SCLS','RDARK_UNDERSTORY_SCLS','LIVESTEM_MR_UNDERSTORY_SCLS','LIVECROOT_MR_UNDERSTORY_SCLS', -'FROOT_MR_UNDERSTORY_SCLS','RESP_G_UNDERSTORY_SCLS','RESP_M_UNDERSTORY_SCLS','TOTVEGC_SCPF', -'LEAFC_SCPF','FNRTC_SCPF','SAPWC_SCPF','STOREC_SCPF','REPROC_SCPF','CEFFLUX_SCPF' +hist_fincl1 = 'FATES_CROWNAREA_PF', 'FATES_CANOPYCROWNAREA_PF', +'FATES_NCL_AP', 'FATES_NPATCH_AP', 'FATES_VEGC_AP', +'FATES_SECONDARY_FOREST_FRACTION', 'FATES_WOOD_PRODUCT', +'FATES_SECONDARY_FOREST_VEGC', 'FATES_SECONDAREA_ANTHRODIST_AP', +'FATES_SECONDAREA_DIST_AP', 'FATES_STOMATAL_COND_AP', 'FATES_LBLAYER_COND_AP', +'FATES_NPP_AP', 'FATES_GPP_AP', 'FATES_PARSUN_Z_CLLL', 'FATES_PARSHA_Z_CLLL', +'FATES_PARSUN_Z_CLLLPF', 'FATES_PARSHA_Z_CLLLPF', 'FATES_PARSUN_Z_CL', +'FATES_PARSHA_Z_CL', 'FATES_LAISUN_Z_CLLL', 'FATES_LAISHA_Z_CLLL', +'FATES_LAISUN_Z_CLLLPF', 'FATES_LAISHA_Z_CLLLPF', 'FATES_LAISUN_TOP_CL', +'FATES_LAISHA_TOP_CL', 'FATES_FABD_SUN_CLLLPF', 'FATES_FABD_SHA_CLLLPF', +'FATES_FABI_SUN_CLLLPF', 'FATES_FABI_SHA_CLLLPF', 'FATES_FABD_SUN_CLLL', +'FATES_FABD_SHA_CLLL', 'FATES_FABI_SUN_CLLL', 'FATES_FABI_SHA_CLLL', +'FATES_PARPROF_DIR_CLLLPF', 'FATES_PARPROF_DIF_CLLLPF', +'FATES_PARPROF_DIR_CLLL', 'FATES_PARPROF_DIF_CLLL', 'FATES_FABD_SUN_TOPLF_CL', +'FATES_FABD_SHA_TOPLF_CL', 'FATES_FABI_SUN_TOPLF_CL', 'FATES_FABI_SHA_TOPLF_CL', +'FATES_NET_C_UPTAKE_CLLL', 'FATES_CROWNAREA_CLLL', 'FATES_NPLANT_CANOPY_SZAP', +'FATES_NPLANT_USTORY_SZAP', 'FATES_DDBH_CANOPY_SZAP', 'FATES_DDBH_USTORY_SZAP', +'FATES_MORTALITY_CANOPY_SZAP', 'FATES_MORTALITY_USTORY_SZAP', +'FATES_NPLANT_SZAPPF', 'FATES_NPP_APPF', 'FATES_VEGC_APPF', 'FATES_GPP_SZPF', +'FATES_GPP_CANOPY_SZPF', 'FATES_AUTORESP_CANOPY_SZPF', 'FATES_GPP_USTORY_SZPF', +'FATES_AUTORESP_USTORY_SZPF', 'FATES_NPP_SZPF', 'FATES_LEAF_ALLOC_SZPF', +'FATES_SEED_ALLOC_SZPF', 'FATES_FROOT_ALLOC_SZPF', 'FATES_BGSAPWOOD_ALLOC_SZPF', +'FATES_BGSTRUCT_ALLOC_SZPF', 'FATES_AGSAPWOOD_ALLOC_SZPF', +'FATES_AGSTRUCT_ALLOC_SZPF', 'FATES_STORE_ALLOC_SZPF', 'FATES_DDBH_SZPF', +'FATES_GROWTHFLUX_SZPF', 'FATES_GROWTHFLUX_FUSION_SZPF', +'FATES_DDBH_CANOPY_SZPF', 'FATES_DDBH_USTORY_SZPF', 'FATES_BASALAREA_SZPF', +'FATES_VEGC_ABOVEGROUND_SZPF', 'FATES_NPLANT_SZPF', 'FATES_NPLANT_ACPF', +'FATES_MORTALITY_BACKGROUND_SZPF', 'FATES_MORTALITY_HYDRAULIC_SZPF', +'FATES_MORTALITY_CSTARV_SZPF', 'FATES_MORTALITY_IMPACT_SZPF', +'FATES_MORTALITY_FIRE_SZPF', 'FATES_MORTALITY_CROWNSCORCH_SZPF', +'FATES_MORTALITY_CAMBIALBURN_SZPF', 'FATES_MORTALITY_TERMINATION_SZPF', +'FATES_MORTALITY_LOGGING_SZPF', 'FATES_MORTALITY_FREEZING_SZPF', +'FATES_MORTALITY_SENESCENCE_SZPF', 'FATES_MORTALITY_AGESCEN_SZPF', +'FATES_MORTALITY_AGESCEN_ACPF', 'FATES_MORTALITY_CANOPY_SZPF', +'FATES_STOREC_CANOPY_SZPF', 'FATES_LEAFC_CANOPY_SZPF', +'FATES_NPLANT_CANOPY_SZPF', 'FATES_MORTALITY_USTORY_SZPF', +'FATES_STOREC_USTORY_SZPF', 'FATES_LEAFC_USTORY_SZPF', +'FATES_NPLANT_USTORY_SZPF', 'FATES_CWD_ABOVEGROUND_DC', +'FATES_CWD_BELOWGROUND_DC', 'FATES_CWD_ABOVEGROUND_IN_DC', +'FATES_CWD_BELOWGROUND_IN_DC', 'FATES_CWD_ABOVEGROUND_OUT_DC', +'FATES_CWD_BELOWGROUND_OUT_DC', 'FATES_AUTORESP_SZPF', 'FATES_GROWAR_SZPF', +'FATES_MAINTAR_SZPF', 'FATES_RDARK_SZPF', 'FATES_AGSAPMAINTAR_SZPF', +'FATES_BGSAPMAINTAR_SZPF', 'FATES_FROOTMAINTAR_SZPF', +'FATES_YESTCANLEV_CANOPY_SZ', 'FATES_YESTCANLEV_USTORY_SZ', +'FATES_VEGC_SZ', 'FATES_DEMOTION_RATE_SZ', 'FATES_PROMOTION_RATE_SZ', +'FATES_SAI_CANOPY_SZ', 'FATES_SAI_USTORY_SZ', 'FATES_NPP_CANOPY_SZ', +'FATES_NPP_USTORY_SZ', 'FATES_TRIMMING_CANOPY_SZ', 'FATES_TRIMMING_USTORY_SZ', +'FATES_CROWNAREA_CANOPY_SZ', 'FATES_CROWNAREA_USTORY_SZ', +'FATES_LEAFCTURN_CANOPY_SZ', 'FATES_FROOTCTURN_CANOPY_SZ', +'FATES_STORECTURN_CANOPY_SZ', 'FATES_STRUCTCTURN_CANOPY_SZ', +'FATES_SAPWOODCTURN_CANOPY_SZ', 'FATES_SEED_PROD_CANOPY_SZ', +'FATES_LEAF_ALLOC_CANOPY_SZ', 'FATES_FROOT_ALLOC_CANOPY_SZ', +'FATES_SAPWOOD_ALLOC_CANOPY_SZ', 'FATES_STRUCT_ALLOC_CANOPY_SZ', +'FATES_SEED_ALLOC_CANOPY_SZ', 'FATES_STORE_ALLOC_CANOPY_SZ', +'FATES_RDARK_CANOPY_SZ', 'FATES_LSTEMMAINTAR_CANOPY_SZ', +'FATES_CROOTMAINTAR_CANOPY_SZ', 'FATES_FROOTMAINTAR_CANOPY_SZ', +'FATES_GROWAR_CANOPY_SZ', 'FATES_MAINTAR_CANOPY_SZ', +'FATES_LEAFCTURN_USTORY_SZ', 'FATES_FROOTCTURN_USTORY_SZ', +'FATES_STORECTURN_USTORY_SZ', 'FATES_STRUCTCTURN_USTORY_SZ', +'FATES_SAPWOODCTURN_USTORY_SZ', 'FATES_SEED_PROD_USTORY_SZ', +'FATES_LEAF_ALLOC_USTORY_SZ', 'FATES_FROOT_ALLOC_USTORY_SZ', +'FATES_SAPWOOD_ALLOC_USTORY_SZ', 'FATES_STRUCT_ALLOC_USTORY_SZ', +'FATES_SEED_ALLOC_USTORY_SZ', 'FATES_STORE_ALLOC_USTORY_SZ', +'FATES_RDARK_USTORY_SZ', 'FATES_LSTEMMAINTAR_USTORY_SZ', +'FATES_CROOTMAINTAR_USTORY_SZ', 'FATES_FROOTMAINTAR_USTORY_SZ', +'FATES_GROWAR_USTORY_SZ', 'FATES_MAINTAR_USTORY_SZ', 'FATES_VEGC_SZPF', +'FATES_LEAFC_SZPF', 'FATES_FROOTC_SZPF', 'FATES_SAPWOODC_SZPF', +'FATES_STOREC_SZPF', 'FATES_REPROC_SZPF', 'FATES_CEFFLUX_SZPF' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm index bd4ddb8b3e..33c91d796a 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefHydro/user_nl_clm @@ -2,10 +2,11 @@ hist_mfilt = 365 hist_nhtfrq = -24 hist_empty_htapes = .true. use_fates_planthydro= .true. -hist_fincl1 = 'FATES_ERRH2O_SCPF','FATES_TRAN_SCPF', -'FATES_SAPFLOW_SCPF','FATES_ITERH1_SCPF','FATES_ATH_SCPF','FATES_TTH_SCPF', -'FATES_STH_SCPF','FATES_LTH_SCPF','FATES_AWP_SCPF','FATES_BTRAN_SCPF', -'FATES_ROOTWGT_SOILVWC_SI','FATES_ROOTWGT_SOILVWCSAT_SI', -'FATES_ROOTWGT_SOILMATPOT_SI','FATES_SOILMATPOT_SL','FATES_SOILVWC_SL','FATES_SOILVWCSAT_SL', -'FATES_ROOTUPTAKE_SI','FATES_ROOTUPTAKE_SL','FATES_ROOTUPTAKE0_SCPF','FATES_ROOTUPTAKE10_SCPF', -'FATES_ROOTUPTAKE50_SCPF','FATES_ROOTUPTAKE100_SCPF' +hist_fincl1 = 'FATES_ERRH2O_SZPF', 'FATES_TRAN_SZPF', +'FATES_SAPFLOW_SZPF', 'FATES_ITERH1_SZPF', 'FATES_ROOTH2O_ABS_SZPF', +'FATES_ROOTH2O_TRANS_SZPF', 'FATES_STEMH2O_SZPF', 'FATES_LEAFH2O_SZPF', +'FATES_ROOTH2O_POT_SZPF', 'FATES_BTRAN_SZPF', 'FATES_ROOTWGT_SOILVWC', +'FATES_ROOTWGT_SOILVWCSAT', 'FATES_ROOTWGT_SOILMATPOT', 'FATES_SOILMATPOT_SL', +'FATES_SOILVWC_SL', 'FATES_SOILVWCSAT_SL', 'FATES_ROOTUPTAKE', +'FATES_ROOTUPTAKE_SL', 'FATES_ROOTUPTAKE0_SZPF', 'FATES_ROOTUPTAKE10_SZPF', +'FATES_ROOTUPTAKE50_SZPF', 'FATES_ROOTUPTAKE100_SZPF' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm index cb7cc262fe..1daed02874 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesColdDefSizeAgeMort/user_nl_clm @@ -1,3 +1,5 @@ hist_empty_htapes = .true. use_fates_cohort_age_tracking=.true. -hist_fincl1 = 'M9_SCPF','M10_SCPF','M10_CAPF','NPLANT_CACLS','NPLANT_CAPF', 'M9_SCLS','M10_SCLS','M10_CACLS' +hist_fincl1 = 'FATES_NPLANT_ACPF', 'FATES_MORTALITY_SENESCENCE_SZPF', +'FATES_MORTALITY_AGESCEN_SZPF', 'FATES_MORTALITY_AGESCEN_ACPF', 'FATES_NPLANT_AC', +'FATES_MORTALITY_SENESCENCE_SZ', 'FATES_MORTALITY_AGESCEN_SZ', 'FATES_MORTALITY_AGESCEN_AC' diff --git a/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm b/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm index 1790bb86c8..7c0e8536c1 100644 --- a/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm +++ b/cime_config/testdefs/testmods_dirs/clm/FatesShortList/user_nl_clm @@ -1,5 +1,5 @@ -hist_fincl1 = 'NPP','GPP','BTRAN','H2OSOI','TLAI','LITTER_IN','LITTER_OUT', - 'FIRE_AREA','SCORCH_HEIGHT','FIRE_INTENSITY','FIRE_TFC_ROS','FIRE_FUEL_MEF', - 'FIRE_FUEL_BULKD','FIRE_FUEL_SAV','FIRE_NESTEROV_INDEX','PFTbiomass', - 'PFTleafbiomass','FIRE_ROS','WIND','AREA_TREES','AREA_PLANT', - 'TOTSOMC','TOTLITC','T_SCALAR','NEP','HR' +hist_fincl1 = 'FATES_AREA_PLANTS', 'FATES_AREA_TREES', 'FATES_VEGC_PF', +'FATES_LEAFC_PF', 'FATES_NESTEROV_INDEX', 'FATES_ROS', 'FATES_FUELCONSUMED', +'FATES_FIRE_INTENSITY', 'FATES_BURNFRAC', 'FATES_FUEL_MEF', 'FATES_FUEL_BULKD', +'FATES_FUEL_SAV', 'FATES_LITTER_IN', 'FATES_LITTER_OUT', 'FATES_NPP', +'FATES_GPP', 'FATES_SCORCH_HEIGHT_APPF', 'FATES_NEP' diff --git a/doc/.ChangeLog_template b/doc/.ChangeLog_template index dde0e4f277..ef92872303 100644 --- a/doc/.ChangeLog_template +++ b/doc/.ChangeLog_template @@ -1,7 +1,7 @@ =============================================================== -Tag name: -Originator(s): -Date: +Tag name: +Originator(s): +Date: One-line Summary: Purpose and description of changes @@ -79,13 +79,13 @@ here is guidance on different available levels of system testing: includes documentation-only tags, tags that just change the tools or some python code that does not impact system runs, etc.) - b) minimal (for use in rare cases where only a small change with + b) minimal (for use in rare cases where only a small change with known behavior is added ... eg. a minor bug fix. This might be to just run the "short" test list, or to run a single test. Whatever makes sense for the particular case.) c) regular (regular tests on normal machines if CTSM source is modified) d) release (regular tests plus the fates, ctsm_sci, mosart and rtm test lists - and normally all of the ancillary tests (build-namelist, python, ptclm, etc.) + and normally all of the ancillary tests (build-namelist, python, ptclm, etc.) would be run as well) In addition, various other tests of the tools, python and perl @@ -99,23 +99,24 @@ infrastructure should be run when appropriate, as described below. build-namelist tests (if CLMBuildNamelist.pm has changed): - cheyenne - + cheyenne - tools-tests (test/tools) (if tools have been changed): - cheyenne - + cheyenne - python testing (if python code has changed; see instructions in python/README.md; document testing done): - (any machine) - + (any machine) - regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): - cheyenne ---- - izumi ------- - + cheyenne ---- + izumi ------- + fates tests: (give name of baseline if different from CTSM tagname, normally fates baselines are fates--) - cheyenne ---- + cheyenne ---- + izumi ------- any other testing (give details below): @@ -134,17 +135,17 @@ Changes answers relative to baseline: Summarize any changes to answers, i.e., - what code configurations: - what platforms/compilers: - - nature of change (roundoff; larger than roundoff/same climate; new climate): + - nature of change (roundoff; larger than roundoff/same climate; new climate): If bitwise differences were observed, how did you show they were no worse than roundoff? If this tag changes climate describe the run(s) done to evaluate the new climate (put details of the simulations in the experiment database) - - casename: + - casename: URL for LMWG diagnostics output used to validate new climate: - + Other details ------------- diff --git a/doc/ChangeLog b/doc/ChangeLog index fc70bc8133..0c9f240f6c 100644 --- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -1,4 +1,106 @@ =============================================================== +Tag name: ctsm5.1.dev064 +Originator(s): afoster (Adrianna Foster) +Date: Mon Nov 29 09:50:50 MST 2021 +One-line Summary: Updates to facilitate FATES history variable overhaul + +Purpose and description of changes +---------------------------------- + +This tag facilitates updates to FATES history variable names, units, other metadata, +and flushing behavior. Variables are now initially flushed to the CTSM ignore value, +then flushed to 0.0 on the FATES side. + +Calls were added to flush_hvars and zero_site_hvars inside the +init_coldstart and restart subroutines in clmfates_interfaceMod.F90. +FATES history variables names were updated to the new names in the +user_nl_clm hist_fincl1 lists in the testmods directory. + +Significant changes to scientifically-supported configurations +-------------------------------------------------------------- + +Does this tag change answers significantly for any of the following physics configurations? +(Details of any changes will be given in the "Answer changes" section below.) + +[ ] clm5_1 + +[ ] clm5_0 + +[ ] ctsm5_0-nwp + +[ ] clm4_5 + +Bugs fixed or introduced +------------------------ + +Issues fixed (include CTSM Issue #): + Fixes FATES issues #530 and #535 + +Notes of particular relevance for users +--------------------------------------- + +Caveats for users (e.g., need to interpolate initial conditions): + +All FATES output history variable units and names have changed so any post-processing +scripts or history variable namelists (e.g. hist_fincl1) will be affected. + + +Notes of particular relevance for developers: +--------------------------------------------- +Changes to tests or testing: + +Updated the hist_fincl1 namelists in the user_nl_clm files in the FATES +testmods directory to reflect FATES history variable name changes. + +Updated name of ERS_Ld30.f45_f45_mg37.I2000Clm50FatesCruRsGs.cheyenne_intel.clm-FatesColdDefReducedComplexSatPhen +in the ExpectedTestFails.xml list, and changed the phase to RUN, as it is now +failing in the run phase. + + +Testing summary: +---------------- + regular tests (aux_clm: https://github.com/ESCOMP/CTSM/wiki/System-Testing-Guide#pre-merge-system-testing): + + cheyenne ---- OK + izumi ------- OK + + fates tests: (baseline: sci.1.50.1_api.18.0.0-ctsm5.1.dev063) + cheyenne ---- OK + izumi ------- OK + + Answer changes + -------------- + + Changes answers relative to baseline: YES + + Summarize any changes to answers, i.e., + - what code configurations: FATES + - what platforms/compilers: all + - nature of change (roundoff; larger than roundoff/same climate; new climate): diagnostic only + + All FATES output history variables and/or units changed so we expect DIFF + or FIELDLIST differences for all comparisons to baselines. + + I created a test at a single point to compare FATES variables + (over a 5-year simulation) from master (sci.1.50.1_api.18.0.0) and this + updated branch. This test confirms that the old variables can be matched + to a new variable (except for a select few where we removed some + variables due to duplication), and that when we did see changes in the + output values, these changes were the expected factor differences based + on the intended units change. + + +Other details +------------- +List any externals directories updated (cime, rtm, mosart, cism, fates, etc.): +fates: sci.1.50.1_api.18.0.0 -> fates-sci.1.51.0_api.19.0.0 + +Pull Requests that document the changes (include PR ids): +(https://github.com/ESCOMP/ctsm/pull) + #1542 -- Updates to facilitate FATES history variable overhaul + +=============================================================== +=============================================================== Tag name: ctsm5.1.dev063 Originator(s): glemieux (Gregory Lemieux,LBL/NGEET,510-486-5049) Date: Tue Nov 23 12:51:48 MST 2021 @@ -33,25 +135,25 @@ Bugs fixed or introduced Issues fixed (include CTSM Issue #): Fixes FATES #744 -- Use of SAI in surface albedo routines. Fixes #1559 -- A few tests in the testlist were for hobart - + Known bugs found since the previous tag (include issue #): #1559 -- A few tests in the testlist were for hobart - - + + Notes of particular relevance for developers: --------------------------------------------- Changes to tests or testing: Replaced the only f19 grid resolution testmod in the izumi fates list with an f45 test - since the pes layout change for izumi from ctsm5.1.dev062 results in high resolution grids - taking longer to run now. Coverage for high resolution fates tests is provided via cheyenne + since the pes layout change for izumi from ctsm5.1.dev062 results in high resolution grids + taking longer to run now. Coverage for high resolution fates tests is provided via cheyenne test lists. - - For the same reasons as above, I transferred the only high res (f19) grid resolution testmod + + For the same reasons as above, I transferred the only high res (f19) grid resolution testmod in the izumi aux_clm list to cheyenne to maintain coverage for this test. The ctsm5.1.dev063 aux_clm baseline on cheyenne has been updated to include this test. - + Testing summary: regular fates ---------------- @@ -69,7 +171,7 @@ Testing summary: regular fates cheyenne ---- OK izumi ------- OK - + fates tests: (baseline: fates-sci.1.50.1_api.18.0.0-ctsm5.1.dev063) cheyenne ---- OK izumi ------- OK @@ -144,7 +246,7 @@ Issues fixed (include CTSM Issue #): Fixes #1543 usgs mask doesn't work with nuopc Known bugs found since the previous tag (include issue #): - #1528 If possible, set more lnd -> mediator coupling fields to spval over ocean + #1528 If possible, set more lnd -> mediator coupling fields to spval over ocean Notes of particular relevance for users --------------------------------------- @@ -160,11 +262,11 @@ Changes made to namelist defaults (e.g., changed parameter values): Substantial timing or memory changes: A bit slower, but less overall memory The PFS test shows the following: - Model Cost: 265.58 pe-hrs/simulated_year - Model Throughput: 165.91 simulated_years/day + Model Cost: 265.58 pe-hrs/simulated_year + Model Throughput: 165.91 simulated_years/day The previous baseline for the MCT driver showed this - Model Cost: 214.41 pe-hrs/simulated_year - Model Throughput: 205.52 simulated_years/day + Model Cost: 214.41 pe-hrs/simulated_year + Model Throughput: 205.52 simulated_years/day The RUN length in TestStatus for dev05* and dev06* versions varied from 58 to 81 seconds so about up to a 20% variation Highwater memory mark is higher (67 vs 131 GB), and last usage (323 vs 165MB) lower than MCT @@ -196,7 +298,7 @@ Testing summary: regular fates ctsm_sci tools cheyenne ---- PASS izumi ------- OK - + fates tests: cheyenne ---- OK @@ -234,7 +336,7 @@ Changes answers relative to baseline: Yes! (because NUOPC is the default driver The diagnostics comparing NUOPC to MCT are here: https://webext.cgd.ucar.edu/I20TR/ctsm51_cesm23a03a_1deg_GSWP3V1_nuopc_hist/lnd/ctsm51_cesm23a03a_1deg_GSWP3V1_nuopc_hist.1995_2014-ctsm51_cesm23a03a_1deg_GSWP3V1_mct_hist.1995_2014/setsIndex.html - + Other details ------------- @@ -253,7 +355,7 @@ Pull Requests that document the changes (include PR ids): (https://github.com/ESCOMP/ctsm/pull) #1530 -- Add compsets for multiple ice-sheets #1502 -- Make the NUOPC driver the default - #1540 -- Implement fates_levleaf as a FATES 1D dimension variable + #1540 -- Implement fates_levleaf as a FATES 1D dimension variable =============================================================== =============================================================== @@ -316,7 +418,7 @@ Changes answers relative to baseline: YES Summarize any changes to answers, i.e., - what code configurations: NUOPC only - what platforms/compilers: all - - nature of change (roundoff; larger than roundoff/same climate; new climate): + - nature of change (roundoff; larger than roundoff/same climate; new climate): Just changes missing value patterns for lnd -> mediator fields Most lnd -> mediator fields now have missing value over ocean diff --git a/doc/ChangeSum b/doc/ChangeSum index 9724dff827..094b43e622 100644 --- a/doc/ChangeSum +++ b/doc/ChangeSum @@ -1,5 +1,6 @@ Tag Who Date Summary ============================================================================================================================ + ctsm5.1.dev064 afoster 11/29/2021 Updates to facilitate FATES history variable overhaul ctsm5.1.dev063 glemieux 11/23/2021 Provide access to the fraction of canopy covered by snow variable to fates ctsm5.1.dev062 erik 11/19/2021 Make NUOPC the default driver rather than MCT ctsm5.1.dev061 mvertens 10/19/2021 Changes needed to get aux history output with cmeps diff --git a/src/main/histFileMod.F90 b/src/main/histFileMod.F90 index 512c50f44a..78e0ef6208 100644 --- a/src/main/histFileMod.F90 +++ b/src/main/histFileMod.F90 @@ -2928,7 +2928,7 @@ subroutine htape_timeconst3D(t, & do lev = 1,nlevsoi do c = bounds%begc,bounds%endc ! Field indices MUST match varnamesl array order above! - if (ifld ==1) histit(c,lev) = cellsand_col(c,lev) + if (ifld ==1) histit(c,lev) = cellsand_col(c,lev) if (ifld ==2) histit(c,lev) = cellclay_col(c,lev) end do end do @@ -3098,8 +3098,8 @@ subroutine htape_timeconst(t, mode) long_name='FATES cwd size class', ncid=nfid(t)) call ncd_defvar(varname='fates_levcan',xtype=ncd_int, dim1name='fates_levcan', & long_name='FATES canopy level', ncid=nfid(t)) - call ncd_defvar(varname='fates_levleaf',xtype=ncd_int, dim1name='fates_levleaf', & - long_name='FATES leaf+stem level', units='VAI', ncid=nfid(t)) + !call ncd_defvar(varname='fates_levleaf',xtype=ncd_int, dim1name='fates_levleaf', & + ! long_name='FATES leaf+stem level', units='VAI', ncid=nfid(t)) call ncd_defvar(varname='fates_canmap_levcnlf',xtype=ncd_int, dim1name='fates_levcnlf', & long_name='FATES canopy level of combined canopy-leaf dimension', ncid=nfid(t)) call ncd_defvar(varname='fates_lfmap_levcnlf',xtype=ncd_int, dim1name='fates_levcnlf', & diff --git a/src/utils/clmfates_interfaceMod.F90 b/src/utils/clmfates_interfaceMod.F90 index 9c09215ab4..eb9482a42c 100644 --- a/src/utils/clmfates_interfaceMod.F90 +++ b/src/utils/clmfates_interfaceMod.F90 @@ -1519,6 +1519,11 @@ subroutine restart( this, bounds_proc, ncid, flag, waterdiagnosticbulk_inst, & ! ------------------------------------------------------------------------ ! Update history IO fields that depend on ecosystem dynamics ! ------------------------------------------------------------------------ + call fates_hist%flush_hvars(nc,upfreq_in=1) + do s = 1,this%fates(nc)%nsites + call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & + upfreq_in=1) + end do call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & this%fates(nc)%sites) @@ -1683,7 +1688,12 @@ subroutine init_coldstart(this, waterstatebulk_inst, waterdiagnosticbulk_inst, & ! ------------------------------------------------------------------------ ! Update history IO fields that depend on ecosystem dynamics ! ------------------------------------------------------------------------ - call fates_hist%update_history_dyn( nc, & + call fates_hist%flush_hvars(nc,upfreq_in=1) + do s = 1,this%fates(nc)%nsites + call fates_hist%zero_site_hvars(this%fates(nc)%sites(s), & + upfreq_in=1) + end do + call fates_hist%update_history_dyn( nc, & this%fates(nc)%nsites, & this%fates(nc)%sites)