--- MITgcm/model/inc/PARAMS.h 2008/08/21 19:35:21 1.221 +++ MITgcm/model/inc/PARAMS.h 2008/09/05 19:55:56 1.223 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.221 2008/08/21 19:35:21 jmc Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.223 2008/09/05 19:55:56 jmc Exp $ C $Name: $ C @@ -145,6 +145,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 +171,7 @@ & writeStatePrec, & writeBinaryPrec, readBinaryPrec, & nonlinFreeSurf, select_rStar, + & selectAddFluid, & momForcingOutAB, tracForcingOutAB, & tempAdvScheme, tempVertAdvScheme, & saltAdvScheme, saltVertAdvScheme, @@ -186,6 +190,7 @@ INTEGER readBinaryPrec INTEGER nonlinFreeSurf INTEGER select_rStar + INTEGER selectAddFluid INTEGER momForcingOutAB, tracForcingOutAB INTEGER tempAdvScheme, tempVertAdvScheme INTEGER saltAdvScheme, saltVertAdvScheme @@ -262,7 +267,6 @@ C useRealFreshWaterFlux :: if True (=Natural BCS), treats P+R-E flux C as a real Fresh Water (=> changes the Sea Level) C if F, converts P+R-E to salt flux (no SL effect) -C useAddFluid :: add mass source or sink of fluid in the interior C- Time-stepping params: C rigidLid :: Set to true to use rigid lid C implicitFreeSurface :: Set to true to use implicit free surface @@ -337,7 +341,7 @@ & momStepping, tempStepping, saltStepping, & tempAdvection, tempIsActiveTr, tempForcing, & saltAdvection, saltIsActiveTr, saltForcing, - & useRealFreshWaterFlux, useAddFluid, + & useRealFreshWaterFlux, & rigidLid, implicitFreeSurface, exactConserv, linFSConserveTr, & uniformLin_PhiSurf, & quasiHydrostatic, nonHydrostatic, @@ -386,7 +390,6 @@ LOGICAL saltIsActiveTr LOGICAL saltForcing LOGICAL useRealFreshWaterFlux - LOGICAL useAddFluid LOGICAL useFullLeith LOGICAL useStrainTensionVisc LOGICAL useAreaViscLength @@ -479,6 +482,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 @@ -682,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, @@ -775,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)