diff --git a/Externals.cfg b/Externals.cfg index 5c426538..4753d64b 100644 --- a/Externals.cfg +++ b/Externals.cfg @@ -22,7 +22,7 @@ required = True [ccs_config] protocol = git -tag = ccs_config_noresm0.0.23 +tag = ccs_config_noresm0.0.24 repo_url = https://github.com/NorESMhub/ccs_config_noresm.git local_path = ccs_config required = True @@ -59,7 +59,7 @@ required = True [cam] protocol = git -tag = noresm_v8_cam6_3_123 +tag = noresm_v9_cam6_3_123 repo_url = https://github.com/NorESMhub/CAM local_path = components/cam externals = Externals_CAM.cfg diff --git a/cime_config/config_compsets.xml b/cime_config/config_compsets.xml index 25463d6d..485266d2 100644 --- a/cime_config/config_compsets.xml +++ b/cime_config/config_compsets.xml @@ -36,7 +36,15 @@ - grid (optional regular expression match for grid to work with the compset) - + + + + + NB1850proto + 1850_CAM%DEV%LT%NORESM%CAMoslo_CLM51%SP_CICE_BLOM_MOSART_SGLC_SWAV + + + B1850 diff --git a/cime_config/config_pes.xml b/cime_config/config_pes.xml index 6a863555..fc7a04f0 100644 --- a/cime_config/config_pes.xml +++ b/cime_config/config_pes.xml @@ -5,37 +5,37 @@ - none - - -3 - -1 - -1 - -2 - -1 - -1 - -1 - -3 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -1 - -3 - 0 - 0 - 0 - + none + + -3 + -1 + -1 + -2 + -1 + -1 + -1 + -3 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + -1 + -3 + 0 + 0 + 0 + @@ -43,75 +43,75 @@ - none - - -4 - -2 - -2 - -2 - -2 - -1 - -4 - -4 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -2 - -4 - 0 - 0 - 0 - + none + + -4 + -2 + -2 + -2 + -2 + -1 + -4 + -4 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + -2 + -4 + 0 + 0 + 0 + - + - none - - -8 - -8 - -8 - -8 - -8 - -8 - -4 - -8 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - + none + + -8 + -8 + -8 + -8 + -1 + -8 + -4 + -8 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + 0 + -8 + 0 + 0 + 0 + @@ -119,37 +119,37 @@ - none - - -8 - -4 - -4 - -4 - -1 - -8 - -4 - -8 - - - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - - - 0 - 0 - 0 - -4 - -8 - 0 - 0 - 0 - + none + + -8 + -4 + -4 + -4 + -1 + -8 + -4 + -8 + + + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + + + 0 + 0 + 0 + -4 + -8 + 0 + 0 + 0 + diff --git a/cime_config/testlist_allactive.xml b/cime_config/testlist_allactive.xml index 2bfcf4dd..133ebe24 100644 --- a/cime_config/testlist_allactive.xml +++ b/cime_config/testlist_allactive.xml @@ -1,6 +1,17 @@ + + + + + + + + + + + diff --git a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop b/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop deleted file mode 100644 index 01738355..00000000 --- a/cime_config/testmods_dirs/allactive/defaultio/user_nl_pop +++ /dev/null @@ -1,6 +0,0 @@ -& tavg_nml - ltavg_ignore_extra_streams = .true. - n_tavg_streams = 1 - tavg_freq_opt = 'nday' - tavg_file_freq_opt = 'nday' -/ diff --git a/cime_config/testmods_dirs/allactive/nb1850proto/shell_commands b/cime_config/testmods_dirs/allactive/nb1850proto/shell_commands new file mode 100644 index 00000000..aeb1463f --- /dev/null +++ b/cime_config/testmods_dirs/allactive/nb1850proto/shell_commands @@ -0,0 +1,2 @@ +./xmlchange BLOM_VCOORD=cntiso_hybrid +./xmlchange BLOM_TURBULENT_CLOSURE= \ No newline at end of file diff --git a/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cam b/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cam new file mode 100644 index 00000000..5e96ef62 --- /dev/null +++ b/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cam @@ -0,0 +1,4 @@ +interpolate_output = .true. +interpolate_gridtype = 1 +interpolate_nlon = 288 +interpolate_nlat = 192 diff --git a/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cice b/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cice new file mode 100644 index 00000000..54b368c1 --- /dev/null +++ b/cime_config/testmods_dirs/allactive/nb1850proto/user_nl_cice @@ -0,0 +1 @@ +distribution_type="sectrobin" diff --git a/cime_config/usermods_dirs/nb1850proto/shell_commands b/cime_config/usermods_dirs/nb1850proto/shell_commands new file mode 100644 index 00000000..aeb1463f --- /dev/null +++ b/cime_config/usermods_dirs/nb1850proto/shell_commands @@ -0,0 +1,2 @@ +./xmlchange BLOM_VCOORD=cntiso_hybrid +./xmlchange BLOM_TURBULENT_CLOSURE= \ No newline at end of file diff --git a/cime_config/usermods_dirs/nb1850proto/user_nl_cam b/cime_config/usermods_dirs/nb1850proto/user_nl_cam new file mode 100644 index 00000000..5e96ef62 --- /dev/null +++ b/cime_config/usermods_dirs/nb1850proto/user_nl_cam @@ -0,0 +1,4 @@ +interpolate_output = .true. +interpolate_gridtype = 1 +interpolate_nlon = 288 +interpolate_nlat = 192 diff --git a/cime_config/usermods_dirs/nb1850proto/user_nl_cice b/cime_config/usermods_dirs/nb1850proto/user_nl_cice new file mode 100644 index 00000000..54b368c1 --- /dev/null +++ b/cime_config/usermods_dirs/nb1850proto/user_nl_cice @@ -0,0 +1 @@ +distribution_type="sectrobin"