Merge branch 'develop' into ci-build

find package MPI removed from nuopc cmakelists instead

.gitignore

@@ -1,4 +1,5 @@
 .vscode/
+*.mod
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

CMakeLists.txt

@@ -1,21 +1,21 @@
-# check environment
+# Check environment
 cmake_minimum_required(VERSION 3.5)
 
-# set the project name and version
+# Set the project name and version
 project(NEXUS
-        VERSION 0.1.0
+        VERSION 0.2.0
         LANGUAGES Fortran)
 
-# include local macros
+# Include local macros
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
-# control where the static and shared libraries are built so that on windows
-# we don't need to tinker with the path to run the executable
+# Control where the static and shared libraries are built
+# so that on Windows we don't need to tinker with the path to run the executable
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}")
 
-# do not build HEMCO standalone
+# Do not build HEMCO standalone executable
 set(HEMCO_EXTERNAL_CONFIG TRUE)
 set(GCCLASSIC_WRAPPER TRUE)
 
@@ -42,6 +42,6 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel")
   string(APPEND CMAKE_Fortran_FLAGS " -diag-disable=10448")
 endif()
 
-# add project's subdirectories
+# Add project's subdirectories
 add_subdirectory(HEMCO)
 add_subdirectory(src)

README.md

@@ -12,7 +12,7 @@ or
 ```
 git clone -b develop --recurse-submodules [email protected]:noaa-oar-arl/NEXUS.git
 ```
-(Replace `noaa-oar-arl` with your fork if desired.)
+(Replace `noaa-oar-arl/NEXUS` with your fork if desired.)
 
 To install the pre-commit hooks, first [install `pre-commit`](https://pre-commit.com/#install),
 e.g. to your Conda environment.
@@ -41,12 +41,8 @@ Input data:
 
 #### GMU Hopper
 
-##### hpc-stack feat. GCC v10 ([somewhat WIP](https://github.com/noaa-oar-arl/ufs-srweather-app/pull/6))
-
 ```
-module reset
-module load hpc-stack/1.2.0
-module load netcdf-fortran/4.5.3-4p
+. /groups/ESS3/zmoon/nexus/env5
 ```
 
 Input data:

src/CMakeLists.txt

@@ -1,49 +1 @@
-add_executable(nexus
-	nexus_driver.F90
-)
-
-add_library(NEXUS_Shared STATIC EXCLUDE_FROM_ALL
-	nexus_error_mod.F90
-	nexus_methods_mod.F90
-)
-
-target_include_directories(NEXUS_Shared
-	INTERFACE ${HEMCO_BINARY_DIR}/mod
-)
-
-# find external libraries
-find_package(ESMF REQUIRED)
-find_package(NetCDF REQUIRED COMPONENTS Fortran)
-
-target_link_libraries(NEXUS_Shared
-        PUBLIC HCOI_Shared
-        PUBLIC esmf
-)
-
-target_link_libraries(nexus
-        PUBLIC NEXUS_Shared
-        PUBLIC esmf
-        PUBLIC NetCDF::NetCDF_Fortran
-)
-
-set_target_properties(nexus PROPERTIES
-	RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
-)
-
-# HEMCO sets a lot of flags already, and since they are set as INTERFACE options
-# they are applied to NEXUS as well.
-# https://github.com/geoschem/HEMCO/blob/main/CMakeLists.txt
-# But we can add a few more flags.
-if(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG")
-  # Note HEMCO only support GNU and Intel
-  if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
-    # Note `-Wpedantic` causes fatal warnings in HEMCO build
-    set(EXTRA_FLAGS_NEXUS -Wconversion-extra -Wcharacter-truncation -Wpedantic)
-  endif()
-  target_compile_options(NEXUS_Shared PRIVATE ${EXTRA_FLAGS_NEXUS})
-  target_compile_options(nexus PRIVATE ${EXTRA_FLAGS_NEXUS})
-endif()
-
-install(TARGETS nexus
-	RUNTIME DESTINATION ${RUNDIR}
-)
+add_subdirectory(nuopc)