--- MITgcm/pkg/autodiff/adcommon.h 2005/02/09 21:20:43 1.5 +++ MITgcm/pkg/autodiff/adcommon.h 2005/04/29 20:45:00 1.9 @@ -9,12 +9,13 @@ #ifdef ALLOW_AUTODIFF_MONITOR common /addynvars_r/ - & adetan, + & adetan, adetah, & aduvel, advvel, adwvel, & adtheta, adsalt, & adgu, adgv, adgt, adgs, & adgunm1, adgvnm1, adgtnm1, adgsnm1 _RL adetan(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) + _RL adetah(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) _RL adgs(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) _RL adgsnm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) _RL adgt(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) @@ -33,15 +34,12 @@ common /addynvars_cd/ & aduveld, advveld, & adetanm1, - & adunm1, advnm1, - & adgucd, adgvcd + & adunm1, advnm1 _RL aduveld(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) _RL advveld(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) _RL adetanm1(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) _RL adunm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) _RL advnm1(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) - _RL adgucd(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) - _RL adgvcd(1-olx:snx+olx,1-oly:sny+oly,nr,nsx,nsy) #endif common /adffields/ @@ -55,6 +53,20 @@ cph _RL adsst(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) cph _RL adsss(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) +#ifdef ALLOW_DIFFKR_CONTROL + COMMON /ADDYNVARS_DIFFKR/ + & addiffKr + _RL addiffKr (1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nr,nSx,nSy) +#endif +#if (defined (ALLOW_EDTAUX_CONTROL) || defined (ALLOW_EDTAUY_CONTROL)) + double precision adeddytaux(1-olx:snx+olx,1-oly:sny+oly,nr,nsx, + $nsy) + double precision adeddytauy(1-olx:snx+olx,1-oly:sny+oly,nr,nsx, + $nsy) + common /adedtauffields/ adeddytaux, adeddytauy + +#endif + #ifdef ALLOW_EXF _RL adhflux(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy) _RL adsflux(1-olx:snx+olx,1-oly:sny+oly,nsx,nsy)