Compile error when undefine EMINUSP and define ICE_THERMO

[remy]

These error present in coawst[version 1225],and I find same code in roms-ice[kate_svn].

Code: Select all

#undefine EMINUSP
#define ICE_MODEL
#define ICE_THERMO

bulk_flux.f90(932): error #6634: The shape matching rules of actual arguments and dummy arguments have been violated.   [EMINUSP]
     &                    evap, EminusP,                                &
--------------------------------^

I modified bulk_flux.F in this way,then compile and run case successfully.

Code: Select all

# if defined EMINUSP || (defined ICE_MODEL && defined ICE_THERMO)
=>
# if defined EMINUSP || (defined ICE_MODEL && defined ICE_THERMO && defined EMINUSP)

Is it correct？

[kate]

Which boils down to simply:

Code: Select all

#ifdef EMINUSP

Frankly, I have not used regular bulk_flux.F since we put in the ccsm_flux.F with the Large and Yeager scheme.