--- MITgcm_contrib/osse/codemod/config_summary.F 2004/06/22 19:44:40 1.1 +++ MITgcm_contrib/osse/codemod/config_summary.F 2004/06/23 18:55:35 1.2 @@ -1,4 +1,4 @@ -C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/osse/codemod/config_summary.F,v 1.1 2004/06/22 19:44:40 afe Exp $ +C $Header: /home/ubuntu/mnt/e9_copy/MITgcm_contrib/osse/codemod/config_summary.F,v 1.2 2004/06/23 18:55:35 afe Exp $ C $Name: $ #include "CPP_OPTIONS.h" @@ -91,36 +91,56 @@ &' /* Reference salinity profile ( ppt ) */') CALL WRITE_0D_R8( viscAh, INDEX_NONE,'viscAh =', &' /* Lateral eddy viscosity ( m^2/s ) */') - CALL WRITE_0D_R8( viscA4, INDEX_NONE,'viscAh =', + CALL WRITE_0D_R8( viscAhMax, INDEX_NONE,'viscAhMax =', + &' /* Maximum lateral eddy viscosity ( m^2/s ) */') + CALL WRITE_0D_R8( viscAhGrid, INDEX_NONE,'viscAhGrid =', + &' /* Grid dependent lateral eddy viscosity ( non-dim. ) */') + CALL WRITE_0D_R8( viscC2leith, INDEX_NONE,'viscC2leith =', + &' /* Leith harmonic viscosity factor ( non-dom. ) */') + CALL WRITE_0D_R8( viscA4, INDEX_NONE,'viscA4 =', &' /* Lateral biharmonic viscosity ( m^4/s ) */') + CALL WRITE_0D_R8( viscA4Max, INDEX_NONE,'viscA4Max =', + &' /* Maximum biharmonic viscosity ( m^2/s ) */') + CALL WRITE_0D_R8( viscA4Grid, INDEX_NONE,'viscA4Grid =', + &' /* Grid dependent biharmonic viscosity ( non-dim. ) */') + CALL WRITE_0D_R8( viscC4leith, INDEX_NONE,'viscC4leith =', + &' /* Leith biharmonic viscosity factor ( non-dom. ) */') CALL WRITE_0D_L( no_slip_sides, INDEX_NONE, & 'no_slip_sides =', ' /* Viscous BCs: No-slip sides */') - IF ( viscAz .NE. UNSET_RL ) THEN - CALL WRITE_0D_R8( viscAz, INDEX_NONE,'viscAz =', - & ' /* Vertical eddy viscosity ( m^2/s ) */') - ENDIF - IF ( viscAp .NE. UNSET_RL ) THEN - CALL WRITE_0D_R8( viscAp, INDEX_NONE,'viscAp =', - & ' /* Vertical eddy viscosity ( Pa^2/s ) */') - ENDIF +c IF ( viscAz .NE. UNSET_RL ) THEN +c CALL WRITE_0D_R8( viscAz, INDEX_NONE,'viscAz =', +c & ' /* Vertical eddy viscosity ( m^2/s ) */') +c ENDIF +c IF ( viscAp .NE. UNSET_RL ) THEN +c CALL WRITE_0D_R8( viscAp, INDEX_NONE,'viscAp =', +c & ' /* Vertical eddy viscosity ( Pa^2/s ) */') +c ENDIF CALL WRITE_0D_R8( viscAr, INDEX_NONE,'viscAr =', &' /* Vertical eddy viscosity ( units of r^2/s ) */') CALL WRITE_0D_R8( diffKhT, INDEX_NONE,'diffKhT =', &' /* Laplacian diffusion of heat laterally ( m^2/s ) */') CALL WRITE_0D_R8( diffK4T, INDEX_NONE,'diffK4T =', &' /* Bihaarmonic diffusion of heat laterally ( m^4/s ) */') - CALL WRITE_0D_R8( diffKzT, INDEX_NONE,'diffKzT =', - &' /* Laplacian diffusion of heat vertically ( m^2/s ) */') +c CALL WRITE_0D_R8( diffKzT, INDEX_NONE,'diffKzT =', +c &' /* Laplacian diffusion of heat vertically ( m^2/s ) */') CALL WRITE_0D_R8( diffKrT, INDEX_NONE,'diffKrT =', &' /* Laplacian diffusion of heat vertically ( m^2/s ) */') CALL WRITE_0D_R8( diffKhS, INDEX_NONE,'diffKhS =', &' /* Laplacian diffusion of salt laterally ( m^2/s ) */') CALL WRITE_0D_R8( diffK4S, INDEX_NONE,'diffK4S =', &' /* Bihaarmonic diffusion of salt laterally ( m^4/s ) */') - CALL WRITE_0D_R8( diffKzS, INDEX_NONE,'diffKzS =', - &' /* Laplacian diffusion of salt vertically ( m^2/s ) */') +c CALL WRITE_0D_R8( diffKzS, INDEX_NONE,'diffKzS =', +c &' /* Laplacian diffusion of salt vertically ( m^2/s ) */') CALL WRITE_0D_R8( diffKrS, INDEX_NONE,'diffKrS =', &' /* Laplacian diffusion of salt vertically ( m^2/s ) */') + CALL WRITE_0D_R8( diffKrBL79surf, INDEX_NONE,'diffKrBL79surf =', + &' /* Surface diffusion for Bryan and Lewis 1979 ( m^2/s ) */') + CALL WRITE_0D_R8( diffKrBL79deep, INDEX_NONE,'diffKrBL79deep =', + &' /* Deep diffusion for Bryan and Lewis 1979 ( m^2/s ) */') + CALL WRITE_0D_R8( diffKrBL79scl, INDEX_NONE,'diffKrBL79scl =', + &' /* Depth scale for Bryan and Lewis 1979 ( m ) */') + CALL WRITE_0D_R8( diffKrBL79Ho, INDEX_NONE,'diffKrBL79Ho =', + &' /* Turning depth for Bryan and Lewis 1979 ( m ) */') WRITE(msgBuf,'(2A)') ' Equation of State : eosType = ', eosType CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT , 1) @@ -145,6 +165,8 @@ & ' /* specific heat (Cp) of dry air ( J/kg/K ) */') CALL WRITE_0D_R8( atm_kappa, INDEX_NONE, 'atm_kappa =', & ' /* kappa (=Rd/Cp ) of dry air */') + CALL WRITE_0D_R8( atm_Rq, INDEX_NONE, 'atm_Rq =', + & ' /* water vap. specific vol. anomaly relative to dry air */') CALL WRITE_0D_R8( atm_Po, INDEX_NONE, 'atm_Po =', & ' /* standard reference pressure ( Pa ) */') CALL WRITE_0D_I( integr_GeoPot, INDEX_NONE, 'integr_GeoPot =', @@ -163,6 +185,10 @@ &' /* Gravitational acceleration ( m/s^2 ) */') CALL WRITE_0D_R8( gBaro, INDEX_NONE,'gBaro =', &' /* Barotropic gravity ( m/s^2 ) */') + CALL WRITE_0D_R8(rotationPeriod,INDEX_NONE,'rotationPeriod =', + &' /* Rotation Period ( s ) */') + CALL WRITE_0D_R8( omega, INDEX_NONE,'omega =', + &' /* Angular velocity ( rad/s ) */') CALL WRITE_0D_R8( f0, INDEX_NONE,'f0 =', &' /* Reference coriolis parameter ( 1/s ) */') CALL WRITE_0D_R8( beta, INDEX_NONE,'beta =', @@ -201,6 +227,9 @@ CALL WRITE_0D_R8( hFacSup, INDEX_NONE, &'hFacSup =', &' /* upper threshold for hFac (nonlinFreeSurf only)*/') + CALL WRITE_0D_I( select_rStar, INDEX_NONE, + &'select_rStar =', + &' /* r* Coordinate options (not yet implemented)*/') CALL WRITE_0D_L( useRealFreshWaterFlux, INDEX_NONE, &'useRealFreshWaterFlux =', &' /* Real Fresh Water Flux on/off flag*/') @@ -220,39 +249,63 @@ &' /* convert F.W. Flux to Salt Flux (-1=use local S)(ppt)*/') ENDIF - CALL WRITE_0D_L( multiDimAdvection, INDEX_NONE, - & 'multiDimAdvection =', - &' /* enable/disable Multi-Dim Advection */') - CALL WRITE_0D_L( staggerTimeStep, INDEX_NONE, - & 'staggerTimeStep =', - &' /* Stagger time stepping on/off flag */') + CALL WRITE_0D_L( nonHydrostatic, INDEX_NONE, + & 'nonHydrostatic =', ' /* Non-Hydrostatic on/off flag */') CALL WRITE_0D_L( momStepping, INDEX_NONE, & 'momStepping =', ' /* Momentum equation on/off flag */') CALL WRITE_0D_L( momAdvection, INDEX_NONE, & 'momAdvection =', ' /* Momentum advection on/off flag */') CALL WRITE_0D_L( momViscosity, INDEX_NONE, & 'momViscosity =', ' /* Momentum viscosity on/off flag */') + CALL WRITE_0D_L( momImplVertAdv, INDEX_NONE, 'momImplVertAdv =', + & '/* Momentum implicit vert. advection on/off*/') + CALL WRITE_0D_L( implicitViscosity, INDEX_NONE, + & 'implicitViscosity =', ' /* Implicit viscosity on/off flag */') CALL WRITE_0D_L( useCoriolis, INDEX_NONE, & 'useCoriolis =', ' /* Coriolis on/off flag */') + CALL WRITE_0D_L( useCDscheme, INDEX_NONE, + & 'useCDscheme =', ' /* CD scheme on/off flag */') + CALL WRITE_0D_L( useJamartWetPoints, INDEX_NONE, + & 'useJamartWetPoints=',' /* Coriolis WetPoints method flag */') + CALL WRITE_0D_L( useJamartMomAdv, INDEX_NONE, + & 'useJamartMomAdv=',' /* V.I. Non-linear terms Jamart flag */') + CALL WRITE_0D_L( SadournyCoriolis, INDEX_NONE, + & 'SadournyCoriolis=',' /* Sadourny Coriolis discr. flag */') + CALL WRITE_0D_L( upwindVorticity, INDEX_NONE, + & 'upwindVorticity=',' /* Upwind bias vorticity flag */') + CALL WRITE_0D_L( useAbsVorticity, INDEX_NONE, + & 'useAbsVorticity=',' /* Work with f+zeta in Coriolis */') + CALL WRITE_0D_L( highOrderVorticity, INDEX_NONE, + & 'highOrderVorticity=',' /* High order interp. of vort. flag */') CALL WRITE_0D_L( momForcing, INDEX_NONE, & 'momForcing =', ' /* Momentum forcing on/off flag */') CALL WRITE_0D_L( momPressureForcing, INDEX_NONE, & 'momPressureForcing =', & ' /* Momentum pressure term on/off flag */') + CALL WRITE_0D_L( staggerTimeStep, INDEX_NONE, + & 'staggerTimeStep =', + &' /* Stagger time stepping on/off flag */') + CALL WRITE_0D_L( multiDimAdvection, INDEX_NONE, + & 'multiDimAdvection =', + &' /* enable/disable Multi-Dim Advection */') + CALL WRITE_0D_L( implicitDiffusion, INDEX_NONE, + & 'implicitDiffusion =','/* Implicit Diffusion on/off flag */') CALL WRITE_0D_L( tempStepping, INDEX_NONE, & 'tempStepping =', ' /* Temperature equation on/off flag */') CALL WRITE_0D_L( tempAdvection, INDEX_NONE, & 'tempAdvection=', ' /* Temperature advection on/off flag */') + CALL WRITE_0D_L( tempImplVertAdv,INDEX_NONE,'tempImplVertAdv =', + & '/* Temp. implicit vert. advection on/off */') CALL WRITE_0D_L( tempForcing, INDEX_NONE, & 'tempForcing =', ' /* Temperature forcing on/off flag */') CALL WRITE_0D_L( saltStepping, INDEX_NONE, & 'saltStepping =', ' /* Salinity equation on/off flag */') CALL WRITE_0D_L( saltAdvection, INDEX_NONE, & 'saltAdvection=', ' /* Salinity advection on/off flag */') + CALL WRITE_0D_L( saltImplVertAdv,INDEX_NONE,'saltImplVertAdv =', + & '/* Sali. implicit vert. advection on/off */') CALL WRITE_0D_L( saltForcing, INDEX_NONE, & 'saltForcing =', ' /* Salinity forcing on/off flag */') - CALL WRITE_0D_L( nonHydrostatic, INDEX_NONE, - & 'nonHydrostatic =', ' /* Non-Hydrostatic on/off flag */') WRITE(msgBuf,'(A)') '// ' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT , 1) @@ -300,10 +353,12 @@ &' /* put T,S Forcing in Adams-Bash. stepping */') CALL WRITE_0D_R8( abeps, INDEX_NONE,'abeps =', &' /* Adams-Bashforth stabilizing weight */') + IF (useCDscheme) THEN CALL WRITE_0D_R8( tauCD, INDEX_NONE,'tauCD =', &' /* CD coupling time-scale ( s ) */') CALL WRITE_0D_R8( rCD, INDEX_NONE,'rCD =', &' /* Normalised CD coupling parameter */') + ENDIF CALL WRITE_0D_R8( startTime, INDEX_NONE,'startTime =', &' /* Run start time ( s ). */') CALL WRITE_0D_R8( endTime, INDEX_NONE,'endTime =', @@ -314,7 +369,16 @@ &' /* Rolling restart/checkpoint file interval ( s ). */') CALL WRITE_0D_R8( dumpFreq, INDEX_NONE,'dumpFreq =', &' /* Model state write out interval ( s ). */') - + CALL WRITE_0D_R8( externForcingPeriod, INDEX_NONE, + & 'externForcingPeriod =', ' /* forcing period (s) */') + CALL WRITE_0D_R8( externForcingCycle, INDEX_NONE, + & 'externForcingCycle =', ' /* period of the cyle (s). */') + CALL WRITE_0D_R8( tauThetaClimRelax, INDEX_NONE, + & 'tauThetaClimRelax =', ' /* relaxation time scale (s) */') + CALL WRITE_0D_R8( tauSaltClimRelax, INDEX_NONE, + & 'tauSaltClimRelax =', ' /* relaxation time scale (s) */') + CALL WRITE_0D_R8( latBandClimRelax, INDEX_NONE, + & 'latBandClimRelax =', ' /* max. Lat. where relaxation */') WRITE(msgBuf,'(A)') '// ' CALL PRINT_MESSAGE( msgBuf, standardMessageUnit, & SQUEEZE_RIGHT , 1)