Fix an error about bs550aer

[kjoti]

This error occurs if a variable has two or more singleton
dimensions and these axis ids (axes_ids) are omitted
when invoking cmor_variable().

[doutriaux1]

@kjoti please add a test case. @mauzey1 please review as well.

The test doesn't fail when I try removing the + lndims. I can see that the changes do automatically include both singletons in the NetCDF files, but the test doesn't detect that.

[kjoti]

@mauzey1
It's mysterious.

There are three tests in Test/test_singletons.c. Even when removing + lndims, the 2nd and 3rd tests will succeed, but the 1st should fail.

Please check output files for each test if your test execution terminates normally. In my execution, a segmentation fault has occurred in the 1st test if + lndims is removed.

[mauzey1]

@kjoti I have added some suggested changes to the test. The changes will allow the test to see if the singleton dimensions were added to the variable. You can commit all three suggestions as a batch.

Also, please update your branch with the latest from master.

[kjoti]

@mauzey1
Thank you for your suggestion.

[mauzey1]

Fixed #464

[wachsylon]

Hi @mauzey1,
for me the
Test/test_singletons.c
is the only test that fails for the 3.6.0 release when I use the 6.9.32 Tables. It says:

! Error: You are defining variable 'bs550aer' (table 6hrLev) with 3 dimensions, when it should have 5

Is there something that I need to change?
Best regards,
Fabi

[mauzey1]

@wachsylon In the 6.9.32 tables, we removed the scatter180 dimension from the variable bs550aer. We then changed test_singleton.c to reflect this change.

I have tested test_singleton.c using the latest build of CMOR 3.6.0 and the 6.9.32 tables and did not get the error. Check if your test file is the latest from the repo, and make sure that it is using the directory with the 6.9.32 table.

[wachsylon]

Thanks, it works with the recent test.

Maybe it is possible to design these tests independently from the tables. The failing test suggests that the cmor version is incompatible with the table version which is probably not true.

Another idea would be to tag a cmor 3.6.1. But I know this is a lot of effort for one test...

[kjoti]

This test was for multiple singleton axes. bs550aer was the only case of having multiple singleton axes (lambda550nm and scatter180).

Since scatter180 has been removed from bs550aer, this test becomes useless and can be discarded.