From a6b9ebb181ef028902426a17c6a220a5708c9d0f Mon Sep 17 00:00:00 2001
From: Ping-Gin Chiu <Ping-Gin.Chiu@uib.no>
Date: Fri, 27 Sep 2024 12:29:02 +0200
Subject: [PATCH 1/2] Add norcpm as ESP component

---
 config/cesm/config_files.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/config/cesm/config_files.xml b/config/cesm/config_files.xml
index 3ed9a2f2fbe..4a894c13432 100644
--- a/config/cesm/config_files.xml
+++ b/config/cesm/config_files.xml
@@ -218,6 +218,7 @@
     <values>
       <value component="desp"      >$CIMEROOT/src/components/data_comps/desp</value>
       <value component="sesp"      >$CIMEROOT/src/components/stub_comps/sesp</value>
+      <value component="norcpm"    >$SRCROOT/components/norcpm</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>
@@ -238,6 +239,7 @@
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
       <value component="mpas-o"   >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
       <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
+      <value component="norcpm"   >$COMP_ROOT_DIR_ESP/cime_config/config_compsets.xml</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>

From 0934dc6886b0c3bc91e46be9ca66ba786e9e39ae Mon Sep 17 00:00:00 2001
From: Ping-Gin Chiu <Ping-Gin.Chiu@uib.no>
Date: Mon, 30 Sep 2024 11:11:12 +0200
Subject: [PATCH 2/2] Move setting order

---
 config/cesm/config_files.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/cesm/config_files.xml b/config/cesm/config_files.xml
index 4a894c13432..65571cd1ace 100644
--- a/config/cesm/config_files.xml
+++ b/config/cesm/config_files.xml
@@ -216,9 +216,9 @@
     <type>char</type>
     <default_value>unset</default_value>
     <values>
+      <value component="norcpm"    >$SRCROOT/components/norcpm</value>
       <value component="desp"      >$CIMEROOT/src/components/data_comps/desp</value>
       <value component="sesp"      >$CIMEROOT/src/components/stub_comps/sesp</value>
-      <value component="norcpm"    >$SRCROOT/components/norcpm</value>
     </values>
     <group>case_comps</group>
     <file>env_case.xml</file>
@@ -239,7 +239,6 @@
       <value component="pop"      >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
       <value component="mpas-o"   >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
       <value component="blom"     >$COMP_ROOT_DIR_OCN/cime_config/config_compsets.xml</value>
-      <value component="norcpm"   >$COMP_ROOT_DIR_ESP/cime_config/config_compsets.xml</value>
     </values>
     <group>case_last</group>
     <file>env_case.xml</file>