From 0eca9b525487b5363df155e5a326de826d6e4274 Mon Sep 17 00:00:00 2001
From: Raffaele Montuoro <raffaele.montuoro@noaa.gov>
Date: Fri, 9 Sep 2022 11:25:50 -0400
Subject: [PATCH] Restore link to CMAQ authoritative repository (#8)

* Handle conflict with FMS mosaic_mod module.
* Remove unnecessary ESMF linking dependencies.
---
 .gitmodules    |  4 ++--
 CMakeLists.txt | 12 ++++++++++--
 src/model/CMAQ |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 44875080..b13c4868 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "src/model/CMAQ"]
 	path = src/model/CMAQ
-	url = https://github.com/NOAA-EMC/CMAQ
-	branch = dev/emc
+	url = https://github.com/USEPA/CMAQ
+	branch = 5.2.1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35b9e6f7..5fe78d86 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,7 +50,8 @@ target_include_directories(drv PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_
                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/io/aqmio>
                                        $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src/model>)
 target_compile_definitions(drv PUBLIC verbose_driver)
-target_link_libraries(drv PRIVATE shr CCTM esmf)
+#target_link_libraries(drv PRIVATE shr CCTM esmf)
+target_link_libraries(drv PRIVATE shr CCTM)
 
 # src/io/aqmio
 add_library(aqmio OBJECT ${aqm_aqmio_files})
@@ -86,6 +87,8 @@ target_compile_definitions(CCTM PUBLIC SUBST_FILES_ID="FILES_CTM.EXT"
                                        SUBST_BARRIER=NOOP_BARRIER
                                        SUBST_SUBGRID_INDEX=NOOP_SUBGRID_INDEX
                                        EDDYX=DUMMY_EDDYX
+                                       MOSAIC_MOD=MOSAIC_MODULE
+                                       Mosaic_Mod=Mosaic_Module
                                        OPCONC=DUMMY_OPCONC
 				       OPACONC=DUMMY_OPACONC
                                        OPWDEP=DUMMY_OPWDEP
@@ -94,7 +97,6 @@ target_compile_definitions(CCTM PUBLIC SUBST_FILES_ID="FILES_CTM.EXT"
 				       verbose_gas
                                        mpas
 				       _AQM_)
-target_link_libraries(CCTM PRIVATE esmf)
 
 # AQM
 add_library(aqm STATIC ${aqm_files} $<TARGET_OBJECTS:shr>
@@ -103,6 +105,12 @@ add_library(aqm STATIC ${aqm_files} $<TARGET_OBJECTS:shr>
                          	    $<TARGET_OBJECTS:ioapi>
                          	    $<TARGET_OBJECTS:CCTM>)
 set_target_properties(aqm PROPERTIES Fortran_MODULE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/mod)
+add_custom_target(aqm_mosaic
+                  COMMAND ${CMAKE_COMMAND} -E create_symlink
+                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_module.mod
+                          ${CMAKE_CURRENT_BINARY_DIR}/mod/mosaic_mod.mod
+                  )
+add_dependencies(aqm aqm_mosaic)
 add_library(aqm::aqm ALIAS aqm)
 target_include_directories(aqm PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/mod>
                                       $<INSTALL_INTERFACE:mod>)
diff --git a/src/model/CMAQ b/src/model/CMAQ
index b82dc06e..be5d28fd 160000
--- a/src/model/CMAQ
+++ b/src/model/CMAQ
@@ -1 +1 @@
-Subproject commit b82dc06e573efabb67f6d7938c20adfb9b45d3d2
+Subproject commit be5d28fd1b60522e6fc98aefeead20e6aac3530b