CoSMIR and AMPR updates

CMakeLists.txt

@@ -1,4 +1,3 @@
-
 # (C) Copyright 2017 - 2022 UCAR
 #
 # This software is licensed under the terms of the Apache Licence Version 2.0
@@ -8,51 +7,51 @@
 # CRTM_coef bundle
 #
 
-cmake_minimum_required( VERSION 3.12 FATAL_ERROR )
-
-project( CRTM_coef VERSION 1.0.0 LANGUAGES Fortran )
+cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
 
-## Ecbuild integration
-find_package( ecbuild QUIET )
-include( ecbuild_system NO_POLICY_SCOPE )
-ecbuild_declare_project()
-list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake )
-set( CMAKE_DIRECTORY_LABELS ${PROJECT_NAME} )
+project(CRTM_coef VERSION 1.0.0 LANGUAGES Fortran)
 
 ## Configuration options
-option( ENABLE_MKL "Use MKL for LAPACK implementation (if available)" OFF )
+option(ENABLE_MKL "Use MKL for LAPACK implementation (if available)" OFF)
 
-#include( ${PROJECT_NAME}_compiler_flags )
+## Dependencies
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_MODULE_PATH}")
+
+include( cmake/${PROJECT_NAME}_compiler_flags.cmake )
 include(GNUInstallDirs)
 
-## Dependencies
-find_package(ecbuild)
-set( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake;${CMAKE_CURRENT_SOURCE_DIR}/ecbuild/cmake;${CMAKE_MODULE_PATH}")
-include( ecbuild_bundle )
+set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -convert little_endian")
+
+find_package(NetCDF REQUIRED COMPONENTS Fortran)
 
-find_package( jedicmake QUIET )
 if(OPENMP)
-  find_package( OpenMP COMPONENTS Fortran )
+  find_package(OpenMP COMPONENTS Fortran)
 endif()
 
-find_package( NetCDF REQUIRED COMPONENTS Fortran )
-
-if( ENABLE_MKL )
-    find_package( MKL )
+if(ENABLE_MKL)
+  find_package(MKL)
 endif()
-if( MKL_FOUND )
-    set( LAPACK_LIBRARIES ${MKL_LIBRARIES} )
+
+if(MKL_FOUND)
+  set(LAPACK_LIBRARIES ${MKL_LIBRARIES})
 else()
-    find_package( LAPACK REQUIRED )
+  find_package(LAPACK REQUIRED)
 endif()
 
-ecbuild_bundle_initialize()
-
-ecbuild_bundle( PROJECT crtm GIT "https://github.com/JCSDA-internal/crtm.git"        BRANCH develop  UPDATE )
+set(CMAKE_INSTALL_PREFIX "${CMAKE_BINARY_DIR}")
 
-ecbuild_bundle_finalize()
+## Add CRTM submodule
+include(FetchContent)
+FetchContent_Declare(
+  crtm
+  GIT_REPOSITORY "https://github.com/JCSDA/crtm.git"
+  GIT_TAG "feature/btj_crtm241_for_crtm_coef"
+)
+FetchContent_MakeAvailable(crtm)
 
-add_subdirectory( src )
+## Add subdirectories
+add_subdirectory(src)
 
-#include(cmake/cdash-integration.cmake)
-#include(CTest)
+## Optional: Include testing and cdash integration if needed
+# include(cmake/cdash-integration.cmake)
+ include(CTest)

README.md

@@ -22,3 +22,13 @@ This repository contains the code to produce instrument transmittance coefficent
 See Contributors.txt.
 # License
 See LICENSE.txt.
+
+#CMake Installation Instructions (only cmake supported for this experimental branch)
+
+mkdir build
+cd build
+cmake ..
+make -j8
+make install 
+
+contact [email protected] / [email protected] for additional help

cmake/CRTM_coef_compiler_flags.cmake

@@ -0,0 +1,28 @@
+# (C) Copyright 2009-2016 ECMWF.
+# 
+# This software is licensed under the terms of the Apache Licence Version 2.0
+# which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. 
+# In applying this licence, ECMWF does not waive the privileges and immunities 
+# granted to it by virtue of its status as an intergovernmental organisation nor
+# does it submit to any jurisdiction.
+
+if( NOT CMAKE_BUILD_TYPE MATCHES "Debug" )
+  add_definitions( -DNDEBUG )
+endif( )
+
+#######################################################################################
+# Fortran
+#######################################################################################
+
+if( CMAKE_Fortran_COMPILER_ID MATCHES "GNU" )
+  include( compiler_flags_GNU_Fortran )
+elseif( CMAKE_Fortran_COMPILER_ID MATCHES "Intel" )
+  include( compiler_flags_Intel_Fortran )
+elseif( CMAKE_Fortran_COMPILER_ID MATCHES "XL" )
+  include( compiler_flags_XL_Fortran )
+elseif( CMAKE_Fortran_COMPILER_ID MATCHES "Cray" )
+  include( compiler_flags_Cray_Fortran )
+else()
+  message( STATUS "Fortran compiler with ID ${CMAKE_CXX_COMPILER_ID} will be used with CMake default options")
+endif()
+