From 4b3e5e4a83bc4ffed2963e84dc775a84abc5a32b Mon Sep 17 00:00:00 2001
From: Steve Goldhaber <stevenng@met.no>
Date: Tue, 5 Nov 2024 11:29:11 +0100
Subject: [PATCH] Fix NorESM use cases

---
 bld/build-namelist               | 24 ++++++++++++------------
 cime_config/config_component.xml |  7 ++++---
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/bld/build-namelist b/bld/build-namelist
index 4afeb4e625..f417ad606b 100755
--- a/bld/build-namelist
+++ b/bld/build-namelist
@@ -2743,16 +2743,16 @@ if ($chem eq 'trop_mam_oslo' ) {
     # Surface emission datasets:
     %species = ();
     %species = (%species,
-                 'DMS      -> ' => 'dms_oslo_emis_file',
-                 'SO2      -> ' => 'so2_oslo_emis_file',
-                 'BC_AX    -> ' => 'bc_ax_oslo_emis_file',
-                 'BC_N     -> ' => 'bc_n_oslo_emis_file',
-                 'BC_NI    -> ' => 'bc_ni_oslo_emis_file',
-                 'SO4_PR   -> ' => 'so4_pr_oslo_emis_file',
-                 'OM_NI    -> ' => 'om_ni_oslo_emis_file',
-   	 	           'monoterp -> ' => 'monoterp_oslo_emis_file',
-	  	           'isoprene -> ' => 'isoprene_oslo_emis_file',
-                 );
+                'DMS      -> ' => 'dms_oslo_emis_file',
+                'SO2      -> ' => 'so2_oslo_emis_file',
+                'BC_AX    -> ' => 'bc_ax_oslo_emis_file',
+                'BC_N     -> ' => 'bc_n_oslo_emis_file',
+                'BC_NI    -> ' => 'bc_ni_oslo_emis_file',
+                'SO4_PR   -> ' => 'so4_pr_oslo_emis_file',
+                'OM_NI    -> ' => 'om_ni_oslo_emis_file',
+                'monoterp -> ' => 'monoterp_oslo_emis_file',
+                'isoprene -> ' => 'isoprene_oslo_emis_file',
+            );
 
     my $first = 1;
     my $pre = "";
@@ -2802,8 +2802,8 @@ if ($chem eq 'trop_mam_oslo' ) {
     # Prescribed species
     add_default($nl, 'tracer_cnst_specifier', 'val'=>"'O3','OH','NO3','HO2'");
     unless (defined $nl->get_value('tracer_cnst_type')) {
-	 add_default($nl, 'tracer_cnst_type',    'ver'=>'fixed_ox');
-	 add_default($nl, 'tracer_cnst_cycle_yr','ver'=>'fixed_ox');
+        add_default($nl, 'tracer_cnst_type',    'ver'=>'fixed_ox');
+        add_default($nl, 'tracer_cnst_cycle_yr','ver'=>'fixed_ox');
     }
 
     my @files = ('tracer_cnst_datapath', 'tracer_cnst_file', 'tracer_cnst_filelist');
diff --git a/cime_config/config_component.xml b/cime_config/config_component.xml
index 14812cb0eb..c8757acfb6 100644
--- a/cime_config/config_component.xml
+++ b/cime_config/config_component.xml
@@ -346,9 +346,10 @@
       <!-- NorESM use cases -->
       <value compset="1850_CAM70%LT%NORESM%TROPMAM4" >1850_camnor_lt_tropmam4</value>
       <value compset="1850_CAM70%LT%NORESM%CAMoslo"  >1850_camnor_lt_osloaero</value>
-      <value compset="HIST_CAM70%LT%NORESM%TROPMAM4">hist_camnor_lt_tropmam4</value>
-      <value compset="HIST_CAM70%LT%NORESM%CAMoslo" >hist_camnor_lt_osloaero</value>
-
+      <value compset="HIST_CAM70%LT%NORESM%TROPMAM4" >hist_camnor_lt_tropmam4</value>
+      <value compset="HIST_CAM70%LT%NORESM%CAMoslo"  >hist_camnor_lt_osloaero</value>
+      <value compset="2000_CAM70%LT%NORESM%TROPMAM4" >2000_camnor_tropmam4</value>
+      <value compset="2000_CAM70%LT%NORESM%CAMoslo"  >2000_camnor_osloaero</value>
       <!-- SCAM defaults to ARM97, all other IOPs are in usermods_dirs -->
       <!--       <value compset="CAM[456]0%SCAM"    >scam_arm97</value> -->
     </values>