Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint63g: | (view) (download) (annotate) |
| Sticky Tag: |
useRealFreshWaterFlux: remove masking of EmPmP (using maskInC) in external_forcing_surf.F and apply mask directly in S/R SOLVE_FOR_PRESSURE.
remove call to EBM_FORCING_SURF.
Store modifs for ptracers adjoint with NLFS (I haven't quite checked why all of these are needed)
sigma (and hybrid-sigma) coordinate code for non-linear free-surface
option for ptracers to convert Salt Relax into additional EmP
- use interior masks (instead of maskH, <- to be remove).
third and step of replacing 3D versions of UICE,VICE,HEFF,AREA by 2D versions.
move from external_forcing_surf.F to ini_forcing.F the p-coord. hack consisting in using pLoad to set phi0surf
add a flag for restoring T and S underneath sea ice
added check, readparms, and more diagnostice to pkg/salt_plume also changed package flag from useSaltPlume to useSALT_PLUME
added pkg/salt_plume by gathering code, which were previously spread around various files in model/inc and model/src results remain numerically identical to before, as a first step towards adding more options, etc., to this package
finishing EmPmR unit changes: replace convertEmP2rUnit by mass2rUnit
Committing An Nguyen's modifications to SALT_PLUME code. This includes addition of a saltPlumeFlux array to FFIELDS and of routine plumefrac.F
extend the use of salt_EvPrRn & temp_EvPrRn to linFS or no RealFreshWaterFlux cases: use tRef(ks) as constant & uniform surf. temp. (if convertFW2Salt > 0) but keep the same default behavior.
replace "recip_rhoConst*horiVertRatio" by mass2rUnit and "rhoConst*recip_horiVertRatio" by rUnit2mass
minor bug fixes for Duffy et al. (GRL 1999) salt plume scheme
o starting implementation of Duffy et al. (GRL 1999) salt plume scheme (#ifdef ALLOW_SALT_PLUME)
fix for useSEAICE=F with ALLOW_SEAICE define: AREA is not initialised !
set PmEpR also in overlap (needed if useKPP with RealFreshWater & NonLin-FreeSurf)
Modifications for bottom topography control o replace hFacC by _hFacC at various places o replace ALLOW_HFACC_CONTROL by ALLOW_DEPTH_CONTROL o add non-self-adjoint cg2d_nsa o update autodiff support routines o re-initialise hfac after ctrl_depth_ini o works for 5x5 box, doesnt work for global_ocean.90x40x15
Apply mask on Fresh-Water flux (needed for SSH forcing) if useRealFreshWaterFlux
- separate shelfice load anomaly from pload (breaks with time
dependent forcing), => introduce constant field shelficeLoadAnomaly.
Its default is 0., but it may be computed more cleverly from (unknown)
t- and s-profiles (tRef, sRef) and actual EOS. For now this has to be
done offline. A good approximation of the pressure load anomaly is
necessary to avoid large initial adjustment processes underneath
deep-reaching shelfice.
First step for a NLFS adjoint o initially suppress rStar (new flag DISABLE_RSTAR_CODE) o new init. routines for calc_r_star, calc_surf_dr o still need to deal with ini_masks_etc o testreport seemed happy
call diagnostics_scale_fill (instead of diagnostics_fill) and avoid temp array
Make lambda[Theta,Salt]ClimRelax spatially varying.
o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX
use flags: fluidIsAir/Water, usingP/ZCoords instead of buoyancyRelation
o remove single quotes (eg. "don't"-->"do not") so that the on-line code browser does not get confused
replace surfaceTendency U,V,S,T,Tice by surfaceForcing U,V,S,T,Tice
will change external_forcing_surf.F to compute fluxes instead of tendencies: for now, compute tendency in 2 steps: fluxes then tendencies ; this shows which exp. are sensitive to external_forcing_surf modification: Y Y Y Y 10 13 16 16 16 16 16 16 13 13 13 13 16 16 13 13 16 FAIL global_ocean.cs32x15 Y Y Y Y 10 16 16 16 16 16 16 16 16 16 13 13 16 13 13 13 16 FAIL global_ocean.cs32x15.thsice Y Y Y Y 10 16 16 16 16 16 16 16 16 13 13 13 13 13 13 11 16 FAIL global_ocean_pressure Y Y Y Y 9 10 16 13 13 16 16 16 16 16 13 13 13 13 16 16 13 FAIL ideal_2D_oce Y Y Y Y 12 16 16 16 16 16 16 16 16 13 13 12 13 16 13 12 16 FAIL lab_sea Y Y Y Y 11 16 16 16 16 16 13 16 16 13 13 12 16 13 13 12 13 FAIL natl_box
change Qnet to always be the net heat flux, (+upward).
add sea-ice loading (sIceLoad) as a new forcing field
add free-surf. rescaling of surf. tendencies when staggerTimeStep + NLFS
o Adjoint for EBM package (needs further testing) o bug fix for parallel EBM in ebm_zonalmean.F
Commiting new energy balance model to repository o package is pkg/ebm o verif. is verification/global_ocean_ebm o references are in ebm_driver.F Will need long integration testing.
Modified model/src/external_forcing_surf.F
o no restoring terms under ice for pkg/seaice o modfied EXF_EXTERNAL_FLUXES option o added exf_albedo parameter
call surface flux time-average diagnostics
o undid all of the cp51 checkin pending some ongoing code cleanups and discussion
o modifications to make FREEZE flux visible to pkg/kpp
- moved surfaceTendencyTice from pkg/seaice to main code
- FREEZE & EXTERNAL_FORCING_SURF moved to FORWARD_STEP
- subroutine FREEZE now limits only surface temperature
(this means new output.txt for global_ocean.90x40x15,
global_ocean.cs32x15, and global_with_exf)
o added surface flux output variables to TIMEAVE_STATVARS
- add salt-flux to forcing fields (used when salty sea-ice forms or melts) - enable to apply restoring only in a latitude band
o first check-in for the "branch-genmake2" merge
o verification suite as run on shelley (gcc 3.2.2):
Wed Oct 8 23:42:29 EDT 2003
T S U V
G D M c m s m s m s m s
E p a R g m m e . m m e . m m e . m m e .
N n k u 2 i a a d i a a d i a a d i a a d
2 d e n d n x n . n x n . n x n . n x n .
OPTFILE=NONE
Y Y Y Y 13 16 16 16 0 16 16 16 16 16 16 16 16 13 12 0 0 pass adjustment.128x64x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 0 0 16 16 0 0 pass adjustment.cs-32x32x1
Y Y Y Y 16 16 16 16 0 16 16 16 16 16 16 22 0 16 16 22 0 pass adjust_nlfs.cs-32x32x1
Y Y Y Y -- 13 13 16 16 13 13 13 13 16 16 16 16 16 16 16 16 N/O advect_cs
Y Y Y Y -- 22 16 16 16 16 16 16 13 16 16 16 16 16 16 16 16 N/O advect_xy
Y Y Y Y -- 13 16 13 16 16 16 16 16 16 16 22 16 16 16 16 16 N/O advect_xz
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass aim.5l_cs
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 16 16 16 16 13 16 pass aim.5l_Equatorial_Channel
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 13 16 16 13 13 16 pass aim.5l_LatLon
Y Y Y Y 13 16 16 16 16 16 16 16 16 16 13 12 13 13 16 13 16 pass exp0
Y Y Y Y 14 16 16 16 16 16 16 16 22 16 16 16 13 16 16 22 16 pass exp1
Y Y Y Y 13 13 16 13 16 16 16 16 16 13 13 16 16 13 13 13 13 pass exp2
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass exp4
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 22 16 pass exp5
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass front_relax
Y Y Y Y 14 16 16 13 13 16 16 13 13 16 13 13 16 12 13 13 16 pass global_ocean.90x40x15
Y Y Y Y 10 16 16 13 13 16 13 16 16 13 13 13 13 16 16 13 16 FAIL global_ocean.cs32x15
Y Y Y Y 6 11 12 13 13 12 13 16 13 9 9 9 9 10 9 9 11 FAIL global_ocean_pressure
Y Y Y Y 14 16 16 13 16 16 16 13 13 13 13 13 16 12 16 13 16 pass global_with_exf
Y Y Y Y 14 16 16 16 16 16 16 16 16 11 13 22 13 16 16 9 16 pass hs94.128x64x5
Y Y Y Y 13 16 16 16 16 16 16 16 16 11 16 16 16 13 16 22 13 pass hs94.1x64x5
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 16 13 13 16 16 22 13 pass hs94.cs-32x32x5
Y Y Y Y 10 10 16 13 13 16 16 16 22 16 13 13 13 13 13 22 13 FAIL ideal_2D_oce
Y Y Y Y 8 16 16 16 16 16 16 16 16 13 13 8 16 16 16 16 16 FAIL internal_wave
Y Y Y Y 14 16 16 16 16 16 16 16 16 13 13 22 13 13 13 22 16 pass inverted_barometer
Y Y Y Y 12 16 16 16 16 16 16 16 16 16 13 12 13 13 13 13 13 FAIL lab_sea
Y Y Y Y 11 16 16 16 16 16 16 16 13 13 13 12 13 16 13 12 13 FAIL natl_box
Y Y Y Y 16 16 16 16 16 16 16 16 22 16 16 16 16 16 16 16 16 pass plume_on_slope
Y Y Y Y 13 16 16 16 16 13 16 16 16 16 16 16 16 13 16 16 16 pass solid-body.cs-32x32x1
o Mods and bug fixes to pkg/cal, pkg/exf, etc. needed for computation of tracer Green's fucntions for ocean inversion project.
* allows a more accurate definition of Ro_Surf (selectFindRoSurf=1) when using P-coordinate; only implemented for atmospheric config.
* update timeave pkg for wVel diagnostic ; put convertEmP2rUnit in PARAMS.h
fixed one line that was longer than 72 characters
o fixed small bug: rhoConst -> rhoConstFresh
o cleaned up the use of rhoNil and rhoConst.
- rhoNil should only appear in the LINEAR equation of state, everywhere
else rhoNil is replaced by rhoConst, e.g. find_rho computes rho-rhoConst
and the dynamical equations are all divided by rhoConst
o introduced new parameter rhoConstFresh, a reference density of fresh
water, to remove the fresh water flux's dependence on rhoNil. The default
value is 999.8 kg/m^3
o cleanup up external_forcing.F and external_forcing_surf.F
- can now be used by both OCEANIC and OCEANICP
implement real fresh water flux with non-linear free-surface
Bringing comments up to data and formatting for document extraction.
Made sure each .F and .h file had the CVS keywords Header and Name at its start. Most had header but very few currently have Name, so lots of changes!
Fixed confusion about units of forcing arrays in FFIELDS.h
namely Fu,Fv,Qnet,Qsw,EmPmR:
- Removed verification/natl_box/code/external_fields_scale.F
(did not differ from that in model/src)
- Changed units of fu,fv,Qnet,Qsw,EmPmR back to proper units
(see FFIELDS.h for description)
- Scale fu,fv,Qnet,Qsw,EmPmR when used in external_forcing_surf.F,
kpp_calc.F and kpp_transport_t.F
- Removed model/src/external_fields_scale.F and calls to it
- verification/natl_box uses flux data with "atmospheric" sign so
a special version of external_fields_load.F is used to
change the data as it's read in. This way, the arrays
have the right units and signs at all times tha a user could
possibly use them.
Rescaling of forcing fields done immediately after reading fields.
External forcing rearranged. Scaling separated from tendency calculation. Shortwave radiation included for use with KPP. Tested for exp(0,2,4).
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |