--- MITgcm/model/inc/PARAMS.h 2007/03/12 23:41:15 1.197 +++ MITgcm/model/inc/PARAMS.h 2007/08/23 19:07:32 1.203 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.197 2007/03/12 23:41:15 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.203 2007/08/23 19:07:32 jmc Exp $ C $Name: $ C @@ -67,6 +67,7 @@ C hydrogThetaFile :: File containing initial hydrographic data for potential C temperature. C hydrogSaltFile :: File containing initial hydrographic data for salinity. +C diffKrFile :: File containing 3D specification of vertical diffusivity C zonalWindFile :: File containing zonal wind data C meridWindFile :: File containing meridional wind data C thetaClimFile :: File containing theta climataology used @@ -93,7 +94,7 @@ & delRFile, delRcFile, & delXFile, delYFile, horizGridFile, & bathyFile, topoFile, shelfIceFile, - & hydrogThetaFile, hydrogSaltFile, + & hydrogThetaFile, hydrogSaltFile, diffKrFile, & zonalWindFile, meridWindFile, thetaClimFile, & saltClimFile, buoyancyRelation, & EmPmRfile, saltFluxFile, @@ -115,8 +116,8 @@ CHARACTER*(MAX_LEN_FNAM) delYFile CHARACTER*(MAX_LEN_FNAM) horizGridFile CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile, shelfIceFile - CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile - CHARACTER*(MAX_LEN_FNAM) hydrogSaltFile + CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile, hydrogSaltFile + CHARACTER*(MAX_LEN_FNAM) diffKrFile CHARACTER*(MAX_LEN_FNAM) zonalWindFile CHARACTER*(MAX_LEN_FNAM) meridWindFile CHARACTER*(MAX_LEN_FNAM) thetaClimFile @@ -501,6 +502,14 @@ C wUnit2rVel :: units conversion factor (Non-Hydrostatic code), C :: from vertical velocity [m/s] to r-coordinate vertical velocity. C :: z-coord: = 1 ; p-coord: rVel [Pa/s] = wSpeed [m/s] * wUnit2rVel +C mass2rUnit :: units conversion factor (surface forcing), +C :: from mass per unit area [kg/m2] to vertical r-coordinate unit. +C :: z-coord: = 1/rhoConst ( [kg/m2] / rho = [m] ) ; +C :: p-coord: = gravity ( [kg/m2] * g = [Pa] ) ; +C rUnit2mass :: units conversion factor (surface forcing), +C :: from vertical r-coordinate unit to mass per unit area [kg/m2]. +C :: z-coord: = rhoConst ( [m] * rho = [kg/m2] ) ; +C :: p-coord: = 1/gravity ( [Pa] / g = [kg/m2] ) ; C phiMin :: Latitude of southern most cell face. C thetaMin :: Longitude of western most cell face (this C is an "inert" parameter but it is included @@ -570,6 +579,12 @@ C diffKrBL79deep :: T/S deep diffusivity (m^2/s) Bryan and Lewis, 1979 C diffKrBL79scl :: depth scale for arctan fn (m) Bryan and Lewis, 1979 C diffKrBL79Ho :: depth offset for arctan fn (m) Bryan and Lewis, 1979 +C BL79LatVary :: polarwise of this latitude diffKrBL79 is applied with +C gradual transition to diffKrBLEQ towards Equator +C diffKrBLEQsurf :: same as diffKrBL79surf but at Equator +C diffKrBLEQdeep :: same as diffKrBL79deep but at Equator +C diffKrBLEQscl :: same as diffKrBL79scl but at Equator +C diffKrBLEQHo :: same as diffKrBL79Ho but at Equator C deltaT :: Default timestep ( s ) C deltaTClock :: Timestep used as model "clock". This determines the C IO frequencies and is used in tagging output. It can @@ -636,11 +651,10 @@ C (notes: a) tracer content of Rain/Evap only used if both C NonLin_FrSurf & useRealFreshWater are set. C b) use model surface (local) value if set to UNSET_RL) -C horiVertRatio :: Ratio on units in vertical to units in horizontal. -C recip_horiVertRatio ( 1 if horiz in m and vertical in m ). -C ( g*rho if horiz in m and vertical in Pa ). -C Ro_SeaLevel :: standard position of Sea-Level in "R" coordinate, used as -C starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel) +C hMixCrit :: criteria for mixed-layer diagnostic +C ivdc_kappa :: implicit vertical diffusivity for convection [m^2/s] +C Ro_SeaLevel :: standard position of Sea-Level in "R" coordinate, used as +C starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel) C sideDragFactor :: side-drag scaling factor (used only if no_slip_sides) C (default=2: full drag ; =1: gives half-slip BC) C bottomDragLinear :: Linear bottom-drag coefficient (units of [r]/s) @@ -669,13 +683,15 @@ & diffKhT, diffK4T, diffKrNrT, & diffKhS, diffK4S, diffKrNrS, & diffKrBL79surf, diffKrBL79deep, diffKrBL79scl, diffKrBL79Ho, + & BL79LatVary, + & diffKrBLEQsurf, diffKrBLEQdeep, diffKrBLEQscl, diffKrBLEQHo, & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow, & hFacMin, hFacMinDz, hFacInf, hFacSup, - & gravity, recip_Gravity, gBaro, + & gravity, recip_gravity, gBaro, & rhonil, recip_rhonil, rhoConst, recip_rhoConst, & rhoFacC, recip_rhoFacC, rhoFacF, recip_rhoFacF, & rhoConstFresh, convertEmP2rUnit, tRef, sRef, phiRef, dBdrRef, - & rVel2wUnit, wUnit2rVel, + & rVel2wUnit, wUnit2rVel, mass2rUnit, rUnit2mass, & baseTime, startTime, endTime, & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq, & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq, @@ -686,8 +702,7 @@ & externForcingCycle, externForcingPeriod, & convertFW2Salt, temp_EvPrRn, salt_EvPrRn, & hFacMinDr, hFacMinDp, - & horiVertRatio, recip_horiVertRatio, - & ivdc_kappa, Ro_SeaLevel, + & ivdc_kappa, hMixCriteria, Ro_SeaLevel, & sideDragFactor, bottomDragLinear, bottomDragQuadratic, nh_Am2, & smoothAbsFuncRange, & tCylIn, tCylOut @@ -754,6 +769,11 @@ _RL diffKrBL79deep _RL diffKrBL79scl _RL diffKrBL79Ho + _RL BL79LatVary + _RL diffKrBLEQsurf + _RL diffKrBLEQdeep + _RL diffKrBLEQscl + _RL diffKrBLEQHo _RL delt _RL tauCD _RL rCD @@ -771,6 +791,7 @@ _RL phiRef(2*Nr+1) _RL dBdrRef(Nr) _RL rVel2wUnit(Nr+1), wUnit2rVel(Nr+1) + _RL mass2rUnit, rUnit2mass _RL baseTime _RL startTime _RL endTime @@ -803,9 +824,8 @@ _RL convertFW2Salt _RL temp_EvPrRn _RL salt_EvPrRn - _RL horiVertRatio - _RL recip_horiVertRatio _RL ivdc_kappa + _RL hMixCriteria _RL Ro_SeaLevel _RL sideDragFactor _RL bottomDragLinear