Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint50c_post: | (view) (download) (annotate) |
| Sticky Tag: |
fix bug in convective adj. diagnostic (ConvectCount is a local array !) and add time-average diagnostic of U*V and diff_Kr*theta
differentiable version of checkpoint46n_post o external_fields_load now part of differentiation list o pressure needs multiple storing; would be nice to have store_pressure at beginning or end of forward_step, e.g. by having phiHyd global (5-dim.) (NB: pressure is needed for certain cases in find_rho, which is also invoked through convective_adjustment). o recomputations in find_rho for cases 'JMD95'/'UNESCO' or 'MDJWF' are OK. o #define ATMOSPHERIC_LOADING should be differentiable o ini_forcing shifted to begining of initialise_varia
o fixed the k-loop range for pressure coordinates: goes backwards from Nr to 2 (instead of Nr-1 to 1)
made convective adjustment work with pressure coordinates: - changed the direction of k-loop in convective_adjustment.F for the case of pressure coordinates (OCEANICP,ATMOSPHERIC buoyancyRelation) - adjusted the reference pressure k-index in convective_adjustment.F - adjusted the convection condition in convect.F (in analogy to calc_ivdc.F) - convective_adjustment no longer computes anything on the halos - removed the warnings about negative salinity from find_rho.F and find_alpha.F; instead the new routine look_for_neg_salinity, called at the beginning of find_rho, find_alpha, and find_beta, does a check of the entire slice, if CPP-option CHECK_SALINITY_FOR_NEGATIVE_VALUES is defined
o Include a new diagnostic variable phiHydLow for the ocean model
- in z-coordinates, it is the bottom pressure anomaly
- in p-coordinates, it is the sea surface elevation
- in both cases, these variable have global drift, reflecting the mass
drift in z-coordinates and the volume drift in p-coordinates
- included time averaging for phiHydLow, be aware of the drift!
o depth-dependent computation of Bo_surf for pressure coordinates
in the ocean (buoyancyRelation='OCEANICP')
- requires a new routine (FIND_RHO_SCALAR) to compute density with only
Theta, Salinity, and Pressure in the parameter list. This routine is
presently contained in find_rho.F. This routine does not give the
correct density for 'POLY3', which would be a z-dependent reference
density.
o cleaned up find_rho
- removed obsolete 'eqn' from the parameter list.
o added two new verification experiments: gop and goz
(4x4 degree global ocean, 15 layers in pressure and height coordinates)
removed some f90 comments ("!")
Header file TR1.h was missing for case ALLOW_PASSIVE_TRACER.
Added PTRACERS package
This allows an arbitrary number of passive tracers to be integrated
forward simultaneously with the dynamicaly model.
+ Implemented so far:
- basic forward algorithm (time-stepping, advection, diffusion, convection)
- I/O and checkpointing
- GM/Redi *but* using the GM/Redi coefficient of Salt
+ Not implemented so far:
- KPP
- OBCS
+ No specific example supplied (yet) but global_ocean.90x40x15 has the
necessary data.ptracer file. Simply use -enable=ptracers and uncomment
line in data.pkg. PTRACER01 then reproduces Salt exactly.
+ This package is disabled by default since it increases storage.
Re-wrote the convective mixing algorithm to use pre-calculated weights. Uses two new routines: - convective_weights() calculates mixing factors A and B, called once - convectively_mixtracers() mixes a tracer (argument) using A and B and is called for each tracer The old call to convect() is simply commented out for the time-being. Similarly, convect.F still exists. I thought it prudent to leave them around until the TAF/TAMC related bits are added.
Minor cleanup.
Bringing comments up to data and formatting for document extraction.
Modifications/fixes to support TAMC differentiability (mostly missing or wrong directives).
Modifications and additions to enable automatic differentiation. Detailed info's in doc/notes_c37_adj.txt
change Time-Average routine names (new package)
recover (after checkpoint35) time average output
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!
Merged changes from branch "branch-atmos-merge" into MAIN (checkpoint34) - substantial modifications to algorithm sequence (dynamics.F) - packaged OBCS, Shapiro filter, Zonal filter, Atmospheric Physics
file convective_adjustment.F was initially added on branch branch-atmos-merge.
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 |