From e0f7f37173b563812abe707c71b4f4c08cb7b6d8 Mon Sep 17 00:00:00 2001
From: Gerhard Theurich <theurich@sourcespring.net>
Date: Thu, 11 Jan 2024 00:46:36 -0800
Subject: [PATCH] Fix some issues that came up after a full rebuild.

---
 src/addon/NUOPC/interface/{NUOPC.c => NUOPC_F.c} |  0
 src/addon/NUOPC/interface/NUOPC_c.F90            | 10 +++-------
 src/addon/NUOPC/interface/makefile               |  2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename src/addon/NUOPC/interface/{NUOPC.c => NUOPC_F.c} (100%)

diff --git a/src/addon/NUOPC/interface/NUOPC.c b/src/addon/NUOPC/interface/NUOPC_F.c
similarity index 100%
rename from src/addon/NUOPC/interface/NUOPC.c
rename to src/addon/NUOPC/interface/NUOPC_F.c
diff --git a/src/addon/NUOPC/interface/NUOPC_c.F90 b/src/addon/NUOPC/interface/NUOPC_c.F90
index 04c0035ad9..ccd174f951 100644
--- a/src/addon/NUOPC/interface/NUOPC_c.F90
+++ b/src/addon/NUOPC/interface/NUOPC_c.F90
@@ -15,7 +15,7 @@
 ! INCLUDES
 #include "ESMF.h"
 
-subroutine f_nuopc_modelsetservices(compPtr, rc)
+subroutine f_nuopc_modelsetservices(gcomp, rc)
 #undef  ESMF_METHOD
 #define ESMF_METHOD "f_nuopc_modelsetservices"
 
@@ -24,18 +24,14 @@ subroutine f_nuopc_modelsetservices(compPtr, rc)
   use NUOPC_Model, only: SetServices
   implicit none
 
-  type(ESMF_CompClass), pointer :: compPtr   !in
-  integer, intent(out)  :: rc         !out
+  type(ESMF_GridComp)   :: gcomp  !in
+  integer, intent(out)  :: rc     !out
 
-  type(ESMF_GridComp)   :: gcomp
   integer :: localrc
 
   ! Initialize return code; assume routine not implemented
   rc = ESMF_RC_NOT_IMPL
 
-  gcomp%compp = compPtr
-  ESMF_INIT_SET_CREATED(gcomp)
-
   call SetServices(gcomp, rc=localrc)
   if (ESMF_LogFoundError(localrc, ESMF_ERR_PASSTHRU,  &
     ESMF_CONTEXT, rcToReturn=rc)) return
diff --git a/src/addon/NUOPC/interface/makefile b/src/addon/NUOPC/interface/makefile
index fa1ff064bd..baf20702c1 100644
--- a/src/addon/NUOPC/interface/makefile
+++ b/src/addon/NUOPC/interface/makefile
@@ -2,7 +2,7 @@
 
 ALL: build_here 
 
-SOURCEC	  = NUOPC.c
+SOURCEC	  = NUOPC_F.c
 SOURCEF	  = NUOPC_c.F90
 SOURCEH	  =