--- MITgcm/model/inc/PARAMS.h 2008/08/05 21:55:29 1.219 +++ MITgcm/model/inc/PARAMS.h 2008/11/14 03:06:11 1.226 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.219 2008/08/05 21:55:29 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.226 2008/11/14 03:06:11 dfer Exp $ C $Name: $ C @@ -46,8 +46,6 @@ C is taken from inline function. C topoFile :: File containing the topography of the surface (unit=m) C (mainly used for the atmosphere = ground height). -C shelfIceFile :: File containing the topography of the shelfice draught -C (unit=m) C hydrogThetaFile :: File containing initial hydrographic data (3-D) C for potential temperature. C hydrogSaltFile :: File containing initial hydrographic data (3-D) @@ -79,7 +77,7 @@ & tRefFile, sRefFile, rhoRefFile, & delRFile, delRcFile, & delXFile, delYFile, horizGridFile, - & bathyFile, topoFile, shelfIceFile, + & bathyFile, topoFile, & hydrogThetaFile, hydrogSaltFile, diffKrFile, & zonalWindFile, meridWindFile, thetaClimFile, & saltClimFile, @@ -102,7 +100,7 @@ CHARACTER*(MAX_LEN_FNAM) delXFile CHARACTER*(MAX_LEN_FNAM) delYFile CHARACTER*(MAX_LEN_FNAM) horizGridFile - CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile, shelfIceFile + CHARACTER*(MAX_LEN_FNAM) bathyFile, topoFile CHARACTER*(MAX_LEN_FNAM) hydrogThetaFile, hydrogSaltFile CHARACTER*(MAX_LEN_FNAM) diffKrFile CHARACTER*(MAX_LEN_FNAM) zonalWindFile @@ -145,6 +143,9 @@ C =0 Linear free surface ; >0 Non-linear C select_rStar :: option related to r* vertical coordinate C =0 (default) use r coord. ; > 0 use r* +C selectAddFluid :: option to add mass source/sink of fluid in the interior +C (3-D generalisation of oceanic real-fresh water flux) +C =0 off ; =1 add fluid ; =-1 virtual flux (no mass added) C momForcingOutAB :: =1: take momentum forcing contribution C out of (=0: in) Adams-Bashforth time stepping. C tracForcingOutAB :: =1: take tracer (Temp,Salt,pTracers) forcing contribution @@ -168,6 +169,7 @@ & writeStatePrec, & writeBinaryPrec, readBinaryPrec, & nonlinFreeSurf, select_rStar, + & selectAddFluid, & momForcingOutAB, tracForcingOutAB, & tempAdvScheme, tempVertAdvScheme, & saltAdvScheme, saltVertAdvScheme, @@ -186,6 +188,7 @@ INTEGER readBinaryPrec INTEGER nonlinFreeSurf INTEGER select_rStar + INTEGER selectAddFluid INTEGER momForcingOutAB, tracForcingOutAB INTEGER tempAdvScheme, tempVertAdvScheme INTEGER saltAdvScheme, saltVertAdvScheme @@ -477,6 +480,7 @@ C rhoFacC :: normalized (by rhoConst) reference density at cell-Center C rhoFacF :: normalized (by rhoConst) reference density at cell-interFace C rhoConstFresh :: Constant reference density for fresh water (rain) +C rho1Ref :: reference vertical profile for density C tRef :: reference vertical profile for potential temperature C sRef :: reference vertical profile for salinity/specific humidity C phiRef :: reference potential (pressure/rho, geopotential) profile @@ -638,7 +642,9 @@ 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 hMixCrit :: criteria for mixed-layer diagnostic +C hMixCriteria:: criteria for mixed-layer diagnostic +C dRhoSmall :: parameter for mixed-layer diagnostic +C hMixSmooth :: Smoothing parameter for mixed-layer diag (default=0=no smoothing) 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) @@ -680,7 +686,7 @@ & gravity, recip_gravity, gBaro, & rhonil, recip_rhonil, rhoConst, recip_rhoConst, & rhoFacC, recip_rhoFacC, rhoFacF, recip_rhoFacF, - & rhoConstFresh, tRef, sRef, phiRef, dBdrRef, + & rhoConstFresh, rho1Ref, tRef, sRef, phiRef, dBdrRef, & rVel2wUnit, wUnit2rVel, mass2rUnit, rUnit2mass, & baseTime, startTime, endTime, & chkPtFreq, pChkPtFreq, dumpFreq, adjDumpFreq, @@ -691,7 +697,7 @@ & externForcingCycle, externForcingPeriod, & convertFW2Salt, temp_EvPrRn, salt_EvPrRn, & hFacMinDr, hFacMinDp, - & ivdc_kappa, hMixCriteria, Ro_SeaLevel, + & ivdc_kappa, hMixCriteria, dRhoSmall, hMixSmooth, Ro_SeaLevel, & sideDragFactor, bottomDragLinear, bottomDragQuadratic, nh_Am2, & smoothAbsFuncRange, & tCylIn, tCylOut, @@ -773,6 +779,7 @@ _RL rhoFacC(Nr), recip_rhoFacC(Nr) _RL rhoFacF(Nr+1), recip_rhoFacF(Nr+1) _RL rhoConstFresh + _RL rho1Ref(Nr) _RL tRef(Nr) _RL sRef(Nr) _RL phiRef(2*Nr+1) @@ -811,6 +818,8 @@ _RL salt_EvPrRn _RL ivdc_kappa _RL hMixCriteria + _RL dRhoSmall + _RL hMixSmooth _RL Ro_SeaLevel _RL sideDragFactor _RL bottomDragLinear @@ -847,55 +856,57 @@ INTEGER integr_GeoPot, selectFindRoSurf C Logical flags for selecting packages + LOGICAL useGAD + LOGICAL useOBCS + LOGICAL useSHAP_FILT + LOGICAL useZONAL_FILT LOGICAL useOPPS LOGICAL usePP81 LOGICAL useMY82 LOGICAL useGGL90 LOGICAL useKPP - LOGICAL useGAD LOGICAL useGMRedi - LOGICAL useOBCS - LOGICAL useAIM - LOGICAL useLand + LOGICAL useDOWN_SLOPE LOGICAL useCAL LOGICAL useEXF + LOGICAL useBulkForce LOGICAL useEBM + LOGICAL useCheapAML LOGICAL useGrdchk LOGICAL useECCO - LOGICAL useSHAP_FILT - LOGICAL useZONAL_FILT + LOGICAL useSBO LOGICAL useFLT LOGICAL usePTRACERS LOGICAL useGCHEM LOGICAL useRBCS LOGICAL useOffLine LOGICAL useMATRIX - LOGICAL useSBO LOGICAL useSEAICE + LOGICAL useSALT_PLUME LOGICAL useShelfIce LOGICAL useThSIce LOGICAL useATM2d - LOGICAL useBulkForce - LOGICAL usefizhi - LOGICAL usegridalt + LOGICAL useAIM + LOGICAL useLand + LOGICAL useFizhi + LOGICAL useGridAlt LOGICAL useDiagnostics - LOGICAL useMNC LOGICAL useREGRID + LOGICAL useMNC LOGICAL useRunClock LOGICAL useEMBED_FILES LOGICAL useMYPACKAGE - LOGICAL useSALT_PLUME - LOGICAL useCheapAML COMMON /PARM_PACKAGES/ + & useGAD, useOBCS, useSHAP_FILT, useZONAL_FILT, & useOPPS, usePP81, useMY82, useGGL90, useKPP, - & useGAD, useGMRedi, useOBCS, useAIM, useLand, - & useCAL, useEXF, useEBM, useGrdchk, useECCO, - & useSHAP_FILT, useZONAL_FILT, useFLT, + & useGMRedi, useDOWN_SLOPE, + & useCAL, useEXF, useBulkForce, useEBM, useCheapAML, + & useGrdchk, useECCO, useSBO, useFLT, & usePTRACERS, useGCHEM, useRBCS, useOffLine, useMATRIX, - & useSBO, useSEAICE, useShelfIce, - & useThSIce, useATM2D, useBulkForce, - & usefizhi, usegridalt, useDiagnostics, useMNC, useREGRID, - & useRunClock, useEMBED_FILES, useSALT_PLUME, useCheapAML, + & useSEAICE, useSALT_PLUME, useShelfIce, useThSIce, + & useATM2D, useAIM, useLand, useFizhi, useGridAlt, + & useDiagnostics, useREGRID, useMNC, + & useRunClock, useEMBED_FILES, & useMYPACKAGE CEH3 ;;; Local Variables: *** CEH3 ;;; mode:fortran ***