Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint52l_pre: | (view) (download) (annotate) |
| Sticky Tag: |
o modifications to make FREEZE flux visible to pkg/kpp
- moved surfaceTendencyTice from pkg/seaice to main code
- FREEZE 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, but note
that results for these three experiments remain
bit-identical to before if allowFreezing=.FALSE.
o added surface flux output variables to TIMEAVE_STATVARS
o time-averaged output for pkg/ptracers
o merging from ecco-branch
use viscAr & diffKr instead of viscAz & diffKz
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
Added CPP style comments to #endif ALLOW_ #endif ALLOW_ -> #endif /* ALLOW_ */
checkpoint50c_pre Merging from release1_p13: o bug fix for pkg/seaice dynamic solver o Added SEAICE_initialHEFF to pkg/seaice
Bug fix for merging between c50 and KPP. ikey was passed from thermodynamics to kpp_calc via common block rather than being recomputed in kpp_calc, in contradiction with new key itdkey. New key ikppkey created, and tamc.h headers updated.
merging.
checkpoint47f_post
Merging from release1_p10:
o modifications for using pkg/exf with pkg/seaice
- pkg/seaice CPP options SEAICE_EXTERNAL_FORCING
and SEAICE_EXTERNAL_FLUXES
- pkg/exf CPP options EXF_READ_EVAP and
EXF_NO_BULK_COMPUTATIONS
- usage examples are Experiments 8 and 9 in
verification/lab_sea/README
- verification/lab_sea default experiment now uses
pkg/gmredi, pkg/kpp, pkg/seaice, and pkg/exf
Merging from release1_p8 branch: Adding package parameters and hooks for new seaice package.
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 o Adjoint-related bug fixes in kpp: - kpp_calc: sore of kpphbl avoids recomputation/call to S/R kppmix - kpp_routines: store of Rib avoids partial recomputation bug of TAF.
o vertical grid : use model standard arrays (drF,drC,rF,rC) instead of delZ. kpp is now compatible with new options (delR,delRc in file "data"). This does not change the results nor the possibility to specify delZ in file "data";
Missing /* and */ around comments after #endif
Added S/R kpp_calc_dummy.
Modifications and additions to enable automatic differentiation. Detailed info's in doc/notes_c37_adj.txt
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.
Modified and fixed version. Tested with verification/natl_box.
KPP package without flag kppPackageIsOn.
Updated version by D. Menemenlis. Takes new unit and sign conventions for forcing fields into account. Includes changes of Ralf in ecco_c30_05.09. Yet to be fully tested.
Packaged KPP mixing scheme.
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 |