Skip to content

Improve cmake targets for code linters #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Matt Shin (matthewrmshin) wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Improve cmake targets for code linters #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CPPLINT.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
set noparent
linelength=100
filter=+build,-build/include_alpha,-build/c++11,+legal,+readability,+runtime,+whitespace,-runtime/references
filter=+build,-build/include_alpha,-build/c++11,+legal,+readability,+runtime,-runtime/references,+whitespace,-whitespace/indent_namespace
7 changes: 4 additions & 3 deletions src/nemo-feedback/NemoFeedback.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include <bitset>
#include <set>
#include <string>
#include <tuple>
#include <utility>
#include <vector>

Expand Down Expand Up @@ -214,7 +215,7 @@ void NemoFeedback::write_all_data(
// Pull out QC flags from UFO
feedback_io::Data<int32_t> variableQCFlagsData;
if (obsdb_.has("QCFlags", ufo_name)) {
variableQCFlagsData = creator.create("QCFlags", ufo_name, int32_t(0));
variableQCFlagsData = creator.create("QCFlags", ufo_name, static_cast<int32_t>(0));
} else {
const size_t iv = flags_.varnames().find(ufo_name);
std::vector<int32_t> variable_qcFlags;
Expand Down Expand Up @@ -396,7 +397,7 @@ NemoFeedback::setupIDs(const NemoFeedbackDataCreator& creator) const {

if (obsdb_.has("MetaData", "buoyIdentifier")) {
feedback_io::Data<std::string> buoyIDs(
creator.create("MetaData", "buoyIdentifier", int32_t(0), buoyIDWidth));
creator.create("MetaData", "buoyIdentifier", static_cast<int32_t>(0), buoyIDWidth));
for (size_t iOb = 0; iOb < stationIDs.n_obs(); ++iOb) {
if (stationIdentificationAvailable) {
if (buoyIDs[iOb] != missingStringFeedback &&
Expand All @@ -421,7 +422,7 @@ NemoFeedback::setupIDs(const NemoFeedbackDataCreator& creator) const {
constexpr size_t stationTypeWidth = 4;
if (obsdb_.has("MetaData", "fdbk_station_type")) {
stationTypes = feedback_io::Data<std::string>(creator.create(
"MetaData", "fdbk_station_type", int32_t(0), stationTypeWidth, true));
"MetaData", "fdbk_station_type", static_cast<int32_t>(0), stationTypeWidth, true));
} else {
std::vector<std::string> blankStationTypeData(obsdb_.nlocs(),
std::string(4, ' '));
Expand Down
6 changes: 4 additions & 2 deletions src/nemo-feedback/NemoFeedbackDataCreator.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,13 @@

#include <string.h>

#include <tuple>
#include <vector>
#include <cstdio>
#include <memory>
#include <sstream>
#include <string>
#include <tuple>
#include <utility>
#include <vector>

#include "eckit/exception/Exceptions.h"

Expand Down
5 changes: 3 additions & 2 deletions src/nemo-feedback/feedback_io/Data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@


#include <iostream>
#include <sstream>
#include <string>
#include <memory>
#include <numeric>
#include <sstream>
#include <string>
#include <utility>
#include <vector>

#include "eckit/exception/Exceptions.h"

Expand Down
5 changes: 3 additions & 2 deletions src/nemo-feedback/feedback_io/Utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,10 @@
// https://github.com/Unidata/netcdf-cxx4

#include <algorithm>
#include <sstream>
#include <iomanip>
#include <cstring>
#include <iomanip>
#include <sstream>
#include <string>

#include "eckit/exception/Exceptions.h"

Expand Down
16 changes: 12 additions & 4 deletions src/nemo-feedback/feedback_io/Writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,13 @@
// https://github.com/Unidata/netcdf-cxx4

#include <algorithm>
#include <sstream>
#include <iomanip>
#include <cstring>
#include <iomanip>
#include <map>
#include <memory>
#include <sstream>
#include <string>
#include <vector>

#include "eckit/exception/Exceptions.h"

Expand Down Expand Up @@ -179,7 +183,9 @@ void Writer<C>::write_metadata_variables(
for (size_t j=0; j < STRINGNAM_NUM; ++j) {
if (j < name_data_.variable_names[i].length()) {
data[j] = static_cast<char>(name_data_.variable_names.at(i).at(j));
} else {data[j] = ' ';}
} else {
data[j] = ' ';
}
}
if (isExtraVariable[i]) {
nc_var_list_extra.putVar({iextra++, 0}, {1, STRINGNAM_NUM}, data);
Expand All @@ -203,7 +209,9 @@ void Writer<C>::write_metadata_variables(
for (size_t j=0; j < STRINGNAM_NUM; ++j) {
if (j < name_data_.additional_names[i].length()) {
data[j] = static_cast<char>(name_data_.additional_names.at(i).at(j));
} else {data[j] = ' ';}
} else {
data[j] = ' ';
}
}
nc_entries_var.putVar({i, 0}, {1, STRINGNAM_NUM}, data);
}
Expand Down
30 changes: 20 additions & 10 deletions src/tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,20 @@ add_subdirectory(Data)
add_subdirectory(nemo-feedback)
add_subdirectory(mains)

ecbuild_add_test( TARGET test_nemo_feedback_coding_norms
TYPE SCRIPT
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/../../tools/cpplint.py
ARGS --recursive ${CMAKE_CURRENT_SOURCE_DIR}/../ )
find_program(
CPPLINT_EXECUTABLE
NAMES cpplint
DOC "Path to the cpplint executable"
)
if( CPPLINT_EXECUTABLE )
ecbuild_add_test(
TARGET "${PROJECT_NAME}_coding_norms"
LABELS lint
TYPE SCRIPT
COMMAND "${CPPLINT_EXECUTABLE}"
ARGS --quiet --recursive "${CMAKE_CURRENT_SOURCE_DIR}/.."
)
endif()

ecbuild_add_test( TARGET test_nemo_feedback_hofx_ice_writer
OMP 1
Expand All @@ -20,7 +30,7 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_ice_file
OMP 1
ARGS testoutput/test_hofx_sic_writer_out.nc testoutput/test_hofx_sic_writer_out_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_ice_writer)
TEST_DEPENDS test_nemo_feedback_hofx_ice_writer )

ecbuild_add_test( TARGET test_nemo_feedback_hofx_two_vars_writer
OMP 1
Expand All @@ -31,7 +41,7 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_two_vars_file
OMP 1
ARGS testoutput/test_hofx_two_vars_writer_out.nc testoutput/test_hofx_two_vars_writer_out_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_two_vars_writer)
TEST_DEPENDS test_nemo_feedback_hofx_two_vars_writer )

ecbuild_add_test( TARGET test_nemo_feedback_hofx_profiles_writer
OMP 1
Expand All @@ -42,7 +52,7 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_profiles_file
OMP 1
ARGS testoutput/test_hofx_profiles_writer_out.nc testoutput/test_hofx_profiles_writer_out_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_profiles_writer)
TEST_DEPENDS test_nemo_feedback_hofx_profiles_writer )

ecbuild_add_test( TARGET test_nemo_feedback_hofx_profiles_two_vars_writer
OMP 1
Expand All @@ -53,7 +63,7 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_profiles_two_vars_file
OMP 1
ARGS testoutput/test_hofx3d_nc_prof_2vars_writer_out.nc testoutput/test_hofx3d_nc_prof_2vars_writer_out_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_profiles_two_vars_writer)
TEST_DEPENDS test_nemo_feedback_hofx_profiles_two_vars_writer )

ecbuild_add_test( TARGET test_nemo_feedback_hofx_mpi_2_writer
OMP 1
Expand All @@ -65,7 +75,7 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_mpi_2_file
OMP 1
ARGS testoutput/test_hofx_mpi_2_writer_out_00001.nc testoutput/test_hofx_mpi_2_writer_out_00001_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_mpi_2_writer)
TEST_DEPENDS test_nemo_feedback_hofx_mpi_2_writer )

ecbuild_add_test( TARGET test_nemo_feedback_hofx_mpi_3_writer
OMP 1
Expand All @@ -77,4 +87,4 @@ ecbuild_add_test( TARGET test_nemo_feedback_hofx_mpi_3_file
OMP 1
ARGS testoutput/test_hofx_mpi_3_writer_out_00001.nc testoutput/test_hofx_mpi_3_writer_out_00001_ref.cdl
COMMAND ./mains/compare_nc_cdl.sh
TEST_DEPENDS test_nemo_feedback_hofx_mpi_3_writer)
TEST_DEPENDS test_nemo_feedback_hofx_mpi_3_writer )
5 changes: 3 additions & 2 deletions src/tests/nemo-feedback/test_feedback_data.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@
* (C) British Crown Copyright 2026 Met Office
*/

#include <algorithm>
#include <iostream>
#include <memory>
#include <string>
#include <algorithm>
#include <numeric>
#include <string>
#include <vector>

#include "eckit/log/Bytes.h"

Expand Down
11 changes: 6 additions & 5 deletions src/tests/nemo-feedback/test_feedback_writer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,16 @@
* (C) British Crown Copyright 2026 Met Office
*/

#include<netcdf>
#include <netcdf>

#include<string>
#include<chrono>
#include<thread>
#include <algorithm>
#include <chrono>
#include <iomanip>
#include <numeric>
#include <sstream>
#include <iomanip>
#include <string>
#include <thread>
#include <vector>

#include "eckit/log/Bytes.h"

Expand Down
Loading