Modifications to include files

[m.hadfield]

Attached are copies of globaldefs.h, riverplume1.h and riverplume2.h with a few modifications:

globaldefs.h:

Code to set the ASSUMED_SHAPE switch has been changed from this

#define ASSUMED_SHAPE
#if defined G95 && defined I686
# undef ASSUMED_SHAPE
#elif defined UNICOS_SN
# undef ASSUMED_SHAPE
#endif

to this

#if !((defined G95 && defined I686) || defined UNICOS_SN)
# define ASSUMED_SHAPE
#endif

The disadvantage with the former is that the "#undef" directives make it impossible to set ASSUMED_SHAPE via the MY_CPPFLAGS variable.

Also the code to set the xxxx_FSOBC macros has been changed, eg this

#if (defined WEST_FSRADIATION  && defined WEST_FSNUDGING)  || \
     defined WEST_M2FLATHER    || defined WEST_FSCLAMPED   || \
     defined WEST_M2REDUCED
# define WEST_FSOBC
#endif

has been changed to

#if (defined WEST_FSRADIATION  && defined WEST_FSNUDGING)  || \
     defined WEST_M2FLATHER    || defined WEST_FSCLAMPED
# define WEST_FSOBC
#endif

The use of xxxx_M2REDUCED does not by itself mean that boundary surface-height data is required. For example it is possible to use xxxx_M2REDUCED with xxxx_FSCHAPMAN, in which case there is no need for xxxx_FSOBC.

riverplume1.h:

Removed a lot of obsolete

#if defined RIVERPLUME1

#elif defined RIVERPLUME2

#endif

stuff.

riverplume2.h:

Removed a couple of unnecessary #undef statements

[arango]

Yes, good point. Thank you.

I also corrected a typo in checkdefs.F. Many thanks to Tom Wainwright for ​reporting this problem.