Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint61s: | (view) (download) (annotate) |
| Sticky Tag: |
add implied forcing corresponding to mass source/sink of fluid
o bridging the gap between eddy stress and GM.
-> eddyTau is replaced with eddyPsi (eddyTau = f x rho0 x eddyPsi)
along with a change in CPP option (now ALLOW_EDDYPSI).
-> when using GM w/ GM_AdvForm:
The total eddy streamfunction (Psi = eddyPsi + K x Slope)
is applied either in the tracer Eq. or in momentum Eq.
depending on data.gmredi (intro. GM_InMomAsStress).
-> ALLOW_EDDYPSI_CONTROL for estimation purpose.
The key modifications are in model/src/taueddy_external_forcing.F
pkg/gmredi/gmredi_calc_*F pkg/gmredi/gmredi_*transport.F
move at the end of EXTERNAL_FORCING_? calls to MYPACKAGE_TENDENCY_APPLY_? (no good reason to call MYPACKAGE_TENDENCY_APPLY at the end or after FIZHI_TENDENCY_APPLY, but more flexible for diagnostics purpose, and little less arbitrary)
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
minor changes to saltplume code to make it compile on evdir
Committing An Nguyen's modifications to SALT_PLUME code. This includes addition of a saltPlumeFlux array to FFIELDS and of routine plumefrac.F
replace "recip_rhoConst*horiVertRatio" by mass2rUnit and "rhoConst*recip_horiVertRatio" by rUnit2mass
Comment an #ifndef ALLOW_AUTODIFF_TAMC that I wasnt aware of.
max -> min bug fix for ALLOW_SALT_PLUME reported by An Nguyen
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)
changes in SWFRAC argument list.
include ifndef ALLOW_AUTODIFF around linear free surface correction
Second wave: correction of tracer source/sink due to Linear Free surface
Adding template package MYPACKAGE to serve as reference. Does nothing.
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
o add hooks for new package shelfice, painless
o Fix I/O inconsistency in pkg/rbcs: replace precFloat32 by readBinaryPrec o Remove 3-dim. relaxation code from pkg/exf (now use only pkg/rbcs) o Thanks to Tom Haine for testing!
o add RBCS call, to relax T/S to 3-D field
fix missing quote (from the last modification)
Adding unfinished 3-dim. relaxation code.
forgot the CD-scheme in previous check-in ; fix FORCING_U & _V.
- use fixed index range (to apply surface forcing) - add argument description (protex compatible ?)
For now use ALLOW_TAU_EDDY only in conjunction with ctrl.
Adding eddy stress controls a la Ferreira et al.
use flags: fluidIsAir/Water, usingP/ZCoords instead of buoyancyRelation
bug fixed in SHORTWAVE_HEATING with partial cell (seems this case is not tested in any of our test-exp)
replace surfaceTendency U,V,S,T,Tice by surfaceForcing U,V,S,T,Tice
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.
no SHORTWAVE HEATING lost at the bottom (improve conservation of heat)
o added some infrastructure to call fizhi and gridalt routines o added package dependencies for fizhi
fix typo error
add standard entry point for AIM.
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
Preparing next round of sync MAIN vs. ecco-branch and adjoint of next checkpoint. o somewhat cleaned package initialisation sequence for ctrl/ cost/ ecco/
Merging from release1_p12: o Modifications for using pkg/exf with pkg/seaice - improved description of the various forcing configurations - added basic radiation bulk formulae to pkg/exf - units/sign fix for evap computation in exf_getffields.F - updated verification/global_with_exf/results/output.txt o Added pkg/sbo for computing IERS Special Bureau for the Oceans (SBO) core products, including oceanic mass, center-of-mass, angular, and bottom pressure (see pkg/sbo/README.sbo). o Lower bound for viscosity/diffusivity in pkg/kpp/kpp_routines.F to avoid negative values in shallow regions. - updated verification/natl_box/results/output.txt - updated verification/lab_sea/results/output.txt o MPI gather, scatter: eesupp/src/gather_2d.F and scatter_2d.F o Added useSingleCpuIO option (see PARAMS.h). o Updated useSingleCpuIO option in mdsio_writefield.F to work with multi-field files, e.g., for single-file pickup. o pkg/seaice: - bug fix in growth.F: QNET for no shortwave case - added HeffFile for specifying initial sea-ice thickness - changed SEAICE_EXTERNAL_FLUXES wind stress implementation o Added missing /* */ to CPP comments in pkg/seaice, pkg/exf, kpp_transport_t.F, forward_step.F, and the_main_loop.F o pkg/seaice: - adjoint-friendly modifications - added a SEAICE_WRITE_PICKUP at end of the_model_main.F
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
Merging from release1_p5 (cf. tag-index for checkpoint46).
Commented out calls to OBCS_SPONGE_*() which doesn't exist. This broke exp4, exp5, internal_wave and plume_on_slope at compile time.
Add hook for obcs sponge layer code.
Bringing comments up to data and formatting for document extraction.
Merge from branch pre38: o essential mods for cubed sphere o debugged atmosphere, dynamcis + physics (aim) o new packages (mom_vecinv, mom_fluxform, ...)
See doc/tag-index and doc/notes_c37_adj.txt Preparation for stand-alone autodifferentiability.
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).
Added term to salt forcing to properly implement "Natural Boundary Conditions".
Modifications/additions for KPP mixing scheme. Instigated by Dimitri.
myCurrentTime was mis-declared as an INTEGER. Bug reported by a user. Free Candy for Marotzke!
o Added "natural BCs" as alternative to "virtual salt flux" o Re-difined precFloat32 and precFloat64 to be 32 and 64 so that their values can be meaningfuly set in the data file o Modified read_write.F to create an exception if readBinaryPrec is not set o Replaced CPP control of viscous BCs with run-time control o Tidied up input-data precision (ie. ini_depths cnh_dbg...) o ini_forcing.F now initialises *all* forcing arrays to zero o Definitively tested verification experiments 0,1,2 and 4 (3 is atmospheric set-up which is in a state of flux)
Changes to allow for atmospheric integration builds of the code
Changes toward incorporating atmospheric experiment
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 |