diff --git a/CMakeLists.txt b/CMakeLists.txt index 29eef624319b86ccb85bd5b836d8a21430bd4507..718ce4c10bc5f471a351fdaef93943c528bb3393 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,13 +65,13 @@ set(HEADERS obl_def.fi ) -add_executable(exec ${SOURCES}) +add_executable(obl ${SOURCES}) #Compilation keys if (CMAKE_Fortran_COMPILER_ID MATCHES "Intel") - target_compile_options(exec PRIVATE $<$<COMPILE_LANGUAGE:Fortran>: -cpp -O2>) + target_compile_options(obl PRIVATE $<$<COMPILE_LANGUAGE:Fortran>: -cpp -O2>) elseif (CMAKE_Fortran_COMPILER_ID MATCHES "GNU") - target_compile_options(exec PRIVATE $<$<COMPILE_LANGUAGE:Fortran>: -cpp -O2>) + target_compile_options(obl PRIVATE $<$<COMPILE_LANGUAGE:Fortran>: -cpp -O2>) endif () IF (USE_SFX) #fetch sfx model @@ -89,7 +89,7 @@ IF (USE_SFX) if(USE_CONFIG) add_definitions(-DUSE_CONFIG_PARSER) endif (USE_CONFIG) - target_link_libraries(exec PRIVATE sfx_lib) + target_link_libraries(obl PRIVATE sfx_lib) else () if(USE_CONFIG) message(ERROR "Config can be only used with new sfx enabled") @@ -106,7 +106,7 @@ if(USE_NETCDF) ) cmake_path(SET netcfd_inc_dir " ${netcdf_inc}" ) message("CMake path is ${netcdf_inc}") - target_compile_options(exec PRIVATE ${netcdf_inc}) + target_compile_options(obl PRIVATE ${netcdf_inc}) include_directories(${netcdf_inc}) execute_process ( COMMAND bash -c "nf-config --flibs | tr -d '\n'" @@ -127,19 +127,19 @@ if(USE_NETCDF) - target_link_options(exec PRIVATE ${netcdff_libs}) - target_link_options(exec PRIVATE ${netcdf_libs}) - target_link_options(exec PRIVATE ${netcdf_static}) + target_link_options(obl PRIVATE ${netcdff_libs}) + target_link_options(obl PRIVATE ${netcdf_libs}) + target_link_options(obl PRIVATE ${netcdf_static}) endif(USE_NETCDF) add_custom_command( - TARGET exec POST_BUILD + TARGET obl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Kato-Phillips/ ${CMAKE_CURRENT_BINARY_DIR}/Kato-Phillips/) add_custom_command( - TARGET exec POST_BUILD + TARGET obl POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/PAPA_06_2017/ ${CMAKE_CURRENT_BINARY_DIR}/PAPA_06_2017/) \ No newline at end of file diff --git a/obl_main.f90 b/obl_main.f90 index 8c11027db62d76a4b683a4b0c50a5633a05d0204..2ae82ed7b510ebb5410b66f471f67291d7d8aba2 100644 --- a/obl_main.f90 +++ b/obl_main.f90 @@ -137,10 +137,9 @@ program obl_main write(*, *) ' obl model, usage:' write(*, *) ' --help' write(*, *) ' print usage options' - write(*, *) ' --setup [key]' - write(*, *) ' key = kato (default) || papa-fluxes || papa' - write(*, *) ' --config [filename]' - write(*, *) ' use configuration file' + write(*, *) ' --config [key] || [filename]' + write(*, *) ' predefined setup [key] = kato (default) || papa-fluxes || papa' + write(*, *) ' use configuration file [filename]' return end if