--- MITgcm/model/inc/PARAMS.h 2001/04/10 22:35:25 1.51 +++ MITgcm/model/inc/PARAMS.h 2001/05/29 14:01:36 1.52 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.51 2001/04/10 22:35:25 heimbach Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.52 2001/05/29 14:01:36 adcroft Exp $ C $Name: $ C C /==========================================================\ @@ -103,12 +103,6 @@ C writeBinaryPrec - Precision used for writing binary files C readBinaryPrec - Precision used for reading binary files C nCheckLev - Holds current checkpoint level -C nShap - "Order" of shapiro filter to apply to -C model prognositic fields. -C nShap == 1 => del2 -C nShap == 2 => del4 -C nShap == 3 => del6 -C etc... COMMON /PARM_I/ & cg2dMaxIters, @@ -119,7 +113,7 @@ & numStepsPerPickup, & writeStatePrec, nCheckLev, & writeBinaryPrec, readBinaryPrec, - & nShap, zonal_filt_sinpow, zonal_filt_cospow + & zonal_filt_sinpow, zonal_filt_cospow INTEGER cg2dMaxIters INTEGER cg2dChkResFreq INTEGER cg3dMaxIters @@ -132,7 +126,6 @@ INTEGER writeBinaryPrec INTEGER readBinaryPrec INTEGER nCheckLev - INTEGER nShap INTEGER zonal_filt_sinpow INTEGER zonal_filt_cospow @@ -165,8 +158,10 @@ C and off. C saltForcing - Flag which turns external forcing of salinit on C and off. -C implicitFreeSurface - Set to true to use implcit free surface C rigidLid - Set to true to use rigid lid +C implicitFreeSurface - Set to true to use implcit free surface +C exactConserv - Set to true to conserve exactly the total Volume +C nonlinFreeSurf - Set to true to use non-linear free surface C momStepping - Turns momentum equation time-stepping off C tempStepping - Turns temperature equation time-stepping off C saltStepping - Turns salinity equation time-stepping off @@ -189,12 +184,13 @@ C allowFreezing - Allows water to freeze and form ice C groundAtK1 - put the surface(k=1) at the Lower Boundary (=ground) COMMON /PARM_L/ usingCartesianGrid, usingSphericalPolarGrid, + & usingCurvilinearGrid, & no_slip_sides,no_slip_bottom, & staggerTimeStep, & momViscosity, momAdvection, momForcing, useCoriolis, & momPressureForcing,tempDiffusion, tempAdvection, tempForcing, & saltDiffusion, saltAdvection, saltForcing, - & implicitFreeSurface, rigidLid, + & rigidLid, implicitFreeSurface, exactConserv, nonlinFreeSurf, & momStepping, tempStepping, saltStepping, & metricTerms, usingSphericalPolarMTerms, & useConstantF, useBetaPlaneF, useSphereF, @@ -206,6 +202,7 @@ & usePickupBeforeC35 LOGICAL usingCartesianGrid LOGICAL usingSphericalPolarGrid + LOGICAL usingCurvilinearGrid LOGICAL usingSphericalPolarMTerms LOGICAL no_slip_sides LOGICAL no_slip_bottom @@ -221,8 +218,10 @@ LOGICAL saltDiffusion LOGICAL saltAdvection LOGICAL saltForcing - LOGICAL implicitFreeSurface LOGICAL rigidLid + LOGICAL implicitFreeSurface + LOGICAL exactConserv + LOGICAL nonlinFreeSurf LOGICAL momStepping LOGICAL tempStepping LOGICAL saltStepping @@ -244,8 +243,10 @@ LOGICAL usePickupBeforeC35 C-- COMMON /PARM_R/ "Real" valued parameters used by the model. -C cg2dTargetResidual -C - Target residual for cg2d solver. +C gg2dTargetResidual +C - Target residual for cg2d solver; no unit (RHS normalisation) +C cg2dTargetResWunit +C - Target residual for cg2d solver; W unit (No RHS normalisation) C cg3dTargetResidual C - Target residual for cg3d solver. C cg2dpcOffDFac - Averaging weight for preconditioner off-diagonal. @@ -333,6 +334,8 @@ C hFacMinDz - Minimum dimesional size of a cell (affects hFacC etc..., m) C hFacMinDp - Minimum dimesional size of a cell (affects hFacC etc..., Pa) C hFacMinDr - Minimum dimesional size of a cell (affects hFacC etc..., units of r) +C hFacInf - Threshold (inf and sup) for fraction size of surface cell +C hFacSup that control vanishing and creating levels C tauCD - CD scheme coupling timescale ( 1/s ) C rCD - CD scheme normalised coupling parameter ( 0-1 ) C startTime - Starting time for this integration ( s ). @@ -369,16 +372,17 @@ C starting value (k=1) for vertical coordinate (rf(1)=Ro_SeaLevel) C bottomDragLinear - Drag coefficient built in to core dynamics C " Quadratic ( linear: 1/s, quadratic: 1/m ) - COMMON /PARM_R/ cg2dTargetResidual, cg2dpcOffDFac, - & cg3dTargetResidual, + COMMON /PARM_R/ cg2dTargetResidual, cg2dTargetResWunit, + & cg2dpcOffDFac, cg3dTargetResidual, & delP, delZ, delR, delX, delY, & deltaT,deltaTmom, deltaTtracer, deltaTClock,abeps, startTime, - & phiMin, thetaMin, rSphere, recip_RSphere, f0, fCori, beta, + & phiMin, thetaMin, rSphere, recip_RSphere, f0, beta, + & fCori, fCoriG, & viscAh, viscAz, viscA4, viscAr, & diffKhT, diffKzT, diffK4T, diffKrT, & diffKhS, diffKzS, diffK4S, diffKrS, & delT, tauCD, rCD, freeSurfFac, implicSurfPress, implicDiv2Dflow, - & hFacMin, hFacMinDz, + & hFacMin, hFacMinDz, hFacInf, hFacSup, & gravity, recip_Gravity, gBaro, rhonil, recip_rhonil, & recip_rhoConst, rhoConst, tRef, sRef, & endTime, chkPtFreq, pchkPtFreq, dumpFreq, taveFreq, @@ -393,6 +397,7 @@ & bottomDragLinear,bottomDragQuadratic _RL cg2dTargetResidual + _RL cg2dTargetResWunit _RL cg3dTargetResidual _RL cg2dpcOffDFac _RL delZ(Nr) @@ -417,6 +422,8 @@ _RL hFacMinDz _RL hFacMinDp _RL hFacMinDr + _RL hFacInf + _RL hFacSup _RL beta _RL viscAh _RL viscAz @@ -447,7 +454,8 @@ _RL tRef(Nr) _RL theta_S(Nr) _RL sRef(Nr) - _RS Fcori(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) + _RS fCori(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) + _RS fCoriG(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) _RL startTime _RL endTime _RL chkPtFreq @@ -501,6 +509,7 @@ LOGICAL useOBCS LOGICAL useAIM LOGICAL useECCO + LOGICAL useSHAP_FILT COMMON /PARM_PACKAGES/ - & useKPP, useGMRedi, useOBCS, useAIM, useECCO + & useKPP, useGMRedi, useOBCS, useAIM, useECCO, useSHAP_FILT