[MITgcm-devel] obsolete SEAICE_MULTICATEGORY flag

[Dimitris Menemenlis]

OK.  Unless there are objections,
I will clean up a little bit, that is, I will:

1) Remove the following 4 lines:

C--   SEAICE_ITD replaces SEAICE_MULTICATEGORY
#ifdef SEAICE_ITD
#undef SEAICE_MULTICATEGORY
#endif

from SEAICE_OPTIONS.h.  They are no longer needed since CPP option 
SEAICE_MULTICATEGORY has been retired.

2) Replace following lines in seaice_readparms.F

CToM<<<
C#ifdef SEAICE_MULTICATEGORY
#if defined(SEAICE_MULTICATEGORY) || defined(SEAICE_ITD)
C in case defined(SEAICE_ITD) MULTDIM = nITD (see SEAICE_SIZE.h)
C because SEAICE_ITD uses code related to SEAICE_MULTICATEGORY
C>>>ToM

with

CToM<<<
#ifdef SEAICE_ITD
C in case defined(SEAICE_ITD) MULTDIM = nITD (see SEAICE_SIZE.h)
C>>>ToM

Cheers

Dimitris Menemenlis

On 12/18/2012 07:30 AM, Gael Forget wrote:
> Hi Dimitris,
>
> I think what Patrick did was to overload MULTDIM
> rather than introduce a new param  NITD. At least that is
> what the lines you are pointing to in seaice_readparms.F imply.
> I cannot speak to  whether that approach works throughout pkg/seaice,
> since I have not looked at the extensive ITD related code additions in
> details.
>
> Jean Michel is correct, except I would have used the word 'merged' rather
> than 'retired'. See revision *1.159* of seaice_growth.F for example.
>
> Cheers,
> Gael
>
> On Dec 18, 2012, at 9:15 AM, Jean-Michel Campin wrote:
>
>> Hi Dimitris,
>>
>> I think you should ask this question to Gael.
>> Although SEAICE_MULTICATEGORY is "retired", it was still
>> there in seaice_readparms.F revision 1.117
>> So I think Torge just addapt this with the SEAICE_ITD bits.
>>
>> Cheers,
>> Jean-Michel
>>
>> On Tue, Dec 18, 2012 at 06:04:52AM -0800, Dimitris Menemenlis wrote:
>>> Patrick and Torge, I noticed following obsolete lines
>>> in pkg/seaice/SEAICE_OPTIONS.h:
>>>
>>> C--   SEAICE_ITD replaces SEAICE_MULTICATEGORY
>>> #ifdef SEAICE_ITD
>>> #undef SEAICE_MULTICATEGORY
>>> #endif
>>>
>>> and in seaice_readparms.F:
>>>
>>> CToM<<<
>>> C#ifdef SEAICE_MULTICATEGORY
>>> #if defined(SEAICE_MULTICATEGORY) || defined(SEAICE_ITD)
>>> C in case defined(SEAICE_ITD) MULTDIM = nITD (see SEAICE_SIZE.h)
>>> C because SEAICE_ITD uses code related to SEAICE_MULTICATEGORY
>>> C>>>ToM
>>>
>>> SEAICE_MULTICATEGORY is no longer used anywhere else in code so
>>> maybe you want to change above accordingly?
>>>
>>> --
>>> Dimitris Menemenlis
>>>
>>> _______________________________________________
>>> MITgcm-devel mailing list
>>> MITgcm-devel at mitgcm.org <mailto:MITgcm-devel at mitgcm.org>
>>> http://mitgcm.org/mailman/listinfo/mitgcm-devel
>>
>> _______________________________________________
>> MITgcm-devel mailing list
>> MITgcm-devel at mitgcm.org <mailto:MITgcm-devel at mitgcm.org>
>> http://mitgcm.org/mailman/listinfo/mitgcm-devel
>
>
>
> _______________________________________________
> MITgcm-devel mailing list
> MITgcm-devel at mitgcm.org
> http://mitgcm.org/mailman/listinfo/mitgcm-devel
>