--- MITgcm/model/inc/PARAMS.h 2005/04/03 05:16:43 1.149 +++ MITgcm/model/inc/PARAMS.h 2005/04/17 00:25:45 1.155 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.149 2005/04/03 05:16:43 edhill Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm/model/inc/PARAMS.h,v 1.155 2005/04/17 00:25:45 edhill Exp $ C $Name: $ C @@ -84,6 +84,7 @@ & saltClimFile, buoyancyRelation, & EmPmRfile, saltFluxFile, & surfQfile, surfQnetFile, surfQswFile, + & lambdaThetaFile, lambdaSaltFile, & uVelInitFile, vVelInitFile, pSurfInitFile, & dQdTfile, ploadFile, & eddyTauxFile, eddyTauyFile, @@ -111,6 +112,8 @@ CHARACTER*(MAX_LEN_FNAM) ploadFile CHARACTER*(MAX_LEN_FNAM) eddyTauxFile CHARACTER*(MAX_LEN_FNAM) eddyTauyFile + CHARACTER*(MAX_LEN_FNAM) lambdaThetaFile + CHARACTER*(MAX_LEN_FNAM) lambdaSaltFile CHARACTER*(MAX_LEN_FNAM) mdsioLocalDir CHARACTER*(MAX_LEN_FNAM) the_run_name CHARACTER*(6) eosType @@ -217,6 +220,9 @@ C if F, converts P+R-E to salt flux (no SL effect) C useFullLeith :: Set to true to use full Leith viscosity (may be unstable C on irregular grids) +C useAnisotropicViscAGridMax :: Set to true to use Alistair's latest +C anisotropic length scale. It is used only for maximum viscosity +C calculations. Alistair recommends a value of viscA*GridMax=.25 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 @@ -244,6 +250,7 @@ C useMultiDimAdvec :: True if multi-dim advection is used at least once C forcing_In_AB :: if False, put forcing (Temp,Salt,Tracers) contribution C out off Adams-Bashforth time stepping. +C startFromPickupAB2 :: with AB-3 code, start from an AB-2 pickup C doThetaClimRelax :: Set true if relaxation to temperature C climatology is required. C doSaltClimRelax :: Set true if relaxation to salinity @@ -275,7 +282,6 @@ C pickup_write_immed :: echo the pickup immediately (for conversion) C timeave_mdsio :: use mdsio for timeave output C snapshot_mdsio :: use mdsio for "snapshot" (dumpfreq/diagfreq) output -C seaice_mdsio :: use mdsio for seaice output C monitor_stdio :: use stdio for monitor output C calendarDumps :: When set, approximate months (30-31 days) and years (360-372 days) C for parameters chkPtFreq, pChkPtFreq, taveFreq, SEAICE_taveFreq, @@ -290,7 +296,7 @@ & tempAdvection, tempForcing, & saltAdvection, saltForcing, & useRealFreshWaterFlux, - & useFullLeith, + & useFullLeith, useAnisotropicViscAGridMax, & rigidLid, implicitFreeSurface, exactConserv, uniformLin_PhiSurf, & momStepping, tempStepping, saltStepping, & metricTerms, usingSphericalPolarMTerms, useNHMTerms, @@ -308,11 +314,10 @@ & usingPCoords, usingZCoords, useDynP_inEos_Zc, setCenterDr, & nonHydrostatic, quasiHydrostatic, globalFiles, useSingleCpuIO, & allowFreezing, useOldFreezing, groundAtK1, - & usePickupBeforeC35, usePickupBeforeC54, debugMode, - & readPickupWithTracer, writePickupWithTracer, + & usePickupBeforeC35, usePickupBeforeC54, startFromPickupAB2, & pickup_read_mdsio, pickup_write_mdsio, pickup_write_immed, - & timeave_mdsio, snapshot_mdsio, monitor_stdio, seaice_mdsio, - & outputTypesInclusive, + & timeave_mdsio, snapshot_mdsio, monitor_stdio, + & outputTypesInclusive, debugMode, & inAdMode, inAdTrue, inAdFalse, inAdExact, & calendarDumps @@ -336,7 +341,7 @@ LOGICAL saltAdvection LOGICAL saltForcing LOGICAL useRealFreshWaterFlux - LOGICAL useFullLeith + LOGICAL useFullLeith, useAnisotropicViscAGridMax LOGICAL rigidLid LOGICAL implicitFreeSurface LOGICAL exactConserv @@ -383,13 +388,11 @@ LOGICAL groundAtK1 LOGICAL usePickupBeforeC35 LOGICAL usePickupBeforeC54 + LOGICAL startFromPickupAB2 LOGICAL debugMode - LOGICAL readPickupWithTracer - LOGICAL writePickupWithTracer LOGICAL pickup_read_mdsio, pickup_write_mdsio LOGICAL pickup_write_immed LOGICAL timeave_mdsio, snapshot_mdsio, monitor_stdio - LOGICAL seaice_mdsio LOGICAL outputTypesInclusive LOGICAL inAdMode, inAdTrue, inAdFalse, inAdExact LOGICAL calendarDumps @@ -427,7 +430,6 @@ C rhoConstFresh :: Constant reference density for fresh water (rain) C tRef :: reference vertical profile for potential temperature C sRef :: reference vertical profile for salinity/specific humidity -C startTime :: Start time for model ( s ) 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 @@ -503,6 +505,9 @@ C freesurfFac :: Parameter to turn implicit free surface term on or off C freesurfac = 1. uses implicit free surface C freesurfac = 0. uses rigid lid +C abEps :: Adams-Bashforth-2 stabilizing weight +C alph_AB :: Adams-Bashforth-3 primary factor +C beta_AB :: Adams-Bashforth-3 secondary factor C implicSurfPress :: parameter of the Crank-Nickelson time stepping : C Implicit part of Surface Pressure Gradient ( 0-1 ) C implicDiv2Dflow :: parameter of the Crank-Nickelson time stepping : @@ -515,6 +520,7 @@ 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 baseTime :: model base time (time origin) = time @ iteration zero C startTime :: Starting time for this integration ( s ). C endTime :: Ending time for this integration ( s ). C chkPtFreq :: Frequency of rolling check pointing ( s ). @@ -538,9 +544,7 @@ C step (of each taveFreq period) put in the time average. C (fraction for 1rst iter = 1 - tave_lastIter) C tauThetaClimRelax :: Relaxation to climatology time scale ( s ). -C lambdaThetaClimRelax :: Inverse time scale for relaxation ( 1/s ). C tauSaltClimRelax :: Relaxation to climatology time scale ( s ). -C lambdaSaltClimRelax :: Inverse time scale for relaxation ( 1/s ). C latBandClimRelax :: latitude band where Relaxation to Clim. is applied, C i.e. where |yC| <= latBandClimRelax C externForcingPeriod :: Is the period of which forcing varies (eg. 1 month) @@ -565,9 +569,8 @@ & cg2dpcOffDFac, cg3dTargetResidual, & delR, delRc, delX, delY, & deltaT, deltaTmom, dTtracerLev, deltaTfreesurf, deltaTClock, - & abeps, startTime, + & abEps, alph_AB, beta_AB, & phiMin, thetaMin, rSphere, recip_RSphere, f0, beta, - & fCori, fCoriG, fCoriCos, & viscAh, viscAhW, viscAhMax, & viscAhGrid, viscAhGridMax, viscAhGridMin, & viscC2leith, viscC2leithD, @@ -584,12 +587,13 @@ & gravity, recip_Gravity, gBaro, rhonil, recip_rhonil, & recip_rhoConst, rhoConst, & rhoConstFresh, convertEmP2rUnit, tRef, sRef, - & endTime, chkPtFreq, pchkPtFreq, dumpFreq, adjDumpFreq, + & baseTime, startTime, endTime, + & chkPtFreq, pchkPtFreq, dumpFreq, adjDumpFreq, & diagFreq, taveFreq, tave_lastIter, monitorFreq, adjMonitorFreq, & afFacMom, vfFacMom, pfFacMom, cfFacMom, foFacMom, mtFacMom, & cosPower, cAdjFreq, omega, rotationPeriod, - & tauThetaClimRelax, lambdaThetaClimRelax, - & tauSaltClimRelax, lambdaSaltClimRelax, + & tauThetaClimRelax, + & tauSaltClimRelax, & tauTr1ClimRelax, lambdaTr1ClimRelax, latBandClimRelax, & externForcingCycle, externForcingPeriod, & convertFW2Salt, temp_EvPrRn, salt_EvPrRn, @@ -612,7 +616,7 @@ _RL deltaTmom _RL dTtracerLev(Nr) _RL deltaTfreesurf - _RL abeps + _RL abEps, alph_AB, beta_AB _RL phiMin _RL thetaMin _RL rSphere @@ -674,9 +678,7 @@ _RL convertEmP2rUnit _RL tRef(Nr) _RL sRef(Nr) - _RS fCori(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) - _RS fCoriG(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) - _RS fCoriCos(1-OLx:sNx+OLx,1-OLy:sNy+OLy,nSx,nSy) + _RL baseTime _RL startTime _RL endTime _RL chkPtFreq @@ -699,9 +701,7 @@ _RL omega _RL rotationPeriod _RL tauThetaClimRelax - _RL lambdaThetaClimRelax _RL tauSaltClimRelax - _RL lambdaSaltClimRelax _RL tauTr1ClimRelax _RL lambdaTr1ClimRelax _RL latBandClimRelax