--- MITgcm_contrib/rpa_layers/layers/LAYERS.h 2009/09/15 19:16:53 1.1 +++ MITgcm_contrib/rpa_layers/layers/LAYERS.h 2009/09/16 18:04:14 1.2 @@ -1,3 +1,6 @@ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/rpa_layers/layers/LAYERS.h,v 1.2 2009/09/16 18:04:14 jmc Exp $ +C $Name: $ + #ifdef ALLOW_LAYERS C-- Header for LAYERS package. By Ryan Abernathey. @@ -20,10 +23,10 @@ #ifdef LAYERS_THICKNESS _RL layers_HU(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nlayers,nSx,nSy) #endif /* LAYERS_THICKNESS */ - COMMON /LAYERS_U/ layers_UFlux + COMMON /LAYERS_U/ layers_UFlux #ifdef LAYERS_THICKNESS & , layers_HU -#endif /* LAYERS_THICKNESS */ +#endif /* LAYERS_THICKNESS */ #endif /* LAYERS_UFLUX */ #ifdef LAYERS_VFLUX @@ -31,10 +34,10 @@ #ifdef LAYERS_THICKNESS _RL layers_HV(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nlayers,nSx,nSy) #endif /* LAYERS_THICKNESS */ - COMMON /LAYERS_V/ layers_VFlux + COMMON /LAYERS_V/ layers_VFlux #ifdef LAYERS_THICKNESS & , layers_HV -#endif /* LAYERS_THICKNESS */ +#endif /* LAYERS_THICKNESS */ #endif /* LAYERS_VFLUX */ C-- The same variables, time-averaged @@ -44,16 +47,16 @@ C Keep track of time _RL layers_TimeAve(Nlayers,nSx,nSy) COMMON /LAYERS_TAVE/ layers_TimeAve - + #ifdef LAYERS_UFLUX _RL layers_UFlux_T(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nlayers,nSx,nSy) #ifdef LAYERS_THICKNESS _RL layers_HU_T(1-OLx:sNx+OLx,1-OLy:sNy+OLy,Nlayers,nSx,nSy) #endif /* LAYERS_THICKNESS */ - COMMON /LAYERS_U_TAVE/ layers_UFlux_T + COMMON /LAYERS_U_TAVE/ layers_UFlux_T #ifdef LAYERS_THICKNESS & , layers_HU_T -#endif /* LAYERS_THICKNESS */ +#endif /* LAYERS_THICKNESS */ #endif /* LAYERS_UFLUX */ #ifdef LAYERS_VFLUX @@ -64,7 +67,7 @@ COMMON /LAYERS_V_TAVE/ layers_VFlux_T #ifdef LAYERS_THICKNESS & , layers_HV_T -#endif /* LAYERS_THICKNESS */ +#endif /* LAYERS_THICKNESS */ #endif /* LAYERS_VFLUX */ #endif /* ALLOW_TIMEAVE */ @@ -82,8 +85,10 @@ INTEGER MapIndex(FineGridMax), CellIndex(FineGridMax) _RL MapFact(FineGridMax) INTEGER NZZ - COMMON /LAYERS_VERT_GRID/ - & layers_G, dZZ, NZZ, MapIndex, MapFact, CellIndex + COMMON /LAYERS_VERT_GRID_I/ + & NZZ, MapIndex, CellIndex + COMMON /LAYERS_VERT_GRID_R/ + & layers_G, dZZ, MapFact #endif /* ALLOW_LAYERS */