/[MITgcm]/MITgcm/model/src/thermodynamics.F
ViewVC logotype

Log of /MITgcm/model/src/thermodynamics.F

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph


Links to HEAD: (view) (download) (annotate)
Links to checkpoint59a: (view) (download) (annotate)
Sticky Tag:

Revision 1.115 - (view) (download) (annotate) - [select for diffs]
Wed Jan 24 08:06:25 2007 UTC (17 years, 3 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58v_post, checkpoint58w_post, checkpoint58x_post, checkpoint58y_post, checkpoint59, checkpoint59a, checkpoint59b, checkpoint59c, checkpoint59d, checkpoint59e
Changes since 1.114: +5 -3 lines
Diff to previous 1.114
Updates for NLFS adjoint.


Revision 1.114 - (view) (download) (annotate) - [select for diffs]
Tue Jan 16 04:40:05 2007 UTC (17 years, 3 months ago) by jmc
Branch: MAIN
Changes since 1.113: +39 -6 lines
Diff to previous 1.113
2nd-Order Moment Advection Scheme (Prather, 1986): first check-in
 - enable by setting #define GAD_ALLOW_SOM_ADVECT (in GAD_OPTIONS.h)
 - used without limiter (AdvScheme=80) or with Prather limiter (AdvScheme=81)


Revision 1.113 - (view) (download) (annotate) - [select for diffs]
Wed Jan 10 19:01:01 2007 UTC (17 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58u_post
Changes since 1.112: +10 -7 lines
Diff to previous 1.112
add GAD_OPTIONS.h (to have DISABLE_MULTIDIM_ADVECTION def/undef)
 and fix argument list of CALC_WSURF_TR call.


Revision 1.112 - (view) (download) (annotate) - [select for diffs]
Sat Jan 6 22:30:17 2007 UTC (17 years, 4 months ago) by heimbach
Branch: MAIN
Changes since 1.111: +1 -3 lines
Diff to previous 1.111
o add calc_wsurf_tr.F to diff.list
o slight changes in store dirs in do_oceanic_phys (M. Mazloff)


Revision 1.111 - (view) (download) (annotate) - [select for diffs]
Fri Jan 5 20:26:09 2007 UTC (17 years, 4 months ago) by dfer
Branch: MAIN
Changes since 1.110: +3 -1 lines
Diff to previous 1.110
include ifndef ALLOW_AUTODIFF around linear free surface correction


Revision 1.110 - (view) (download) (annotate) - [select for diffs]
Fri Jan 5 01:29:31 2007 UTC (17 years, 4 months ago) by dfer
Branch: MAIN
Changes since 1.109: +6 -1 lines
Diff to previous 1.109
Second wave: correction of tracer source/sink due to Linear
Free surface


Revision 1.109 - (view) (download) (annotate) - [select for diffs]
Tue Dec 5 05:25:08 2006 UTC (17 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58s_post, checkpoint58t_post, mitgcm_mapl_00
Changes since 1.108: +4 -1 lines
Diff to previous 1.108
start to implement deep-atmosphere and/or anelastic formulation


Revision 1.108 - (view) (download) (annotate) - [select for diffs]
Tue Jul 18 04:43:58 2006 UTC (17 years, 9 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58n_post, checkpoint58o_post, checkpoint58p_post, checkpoint58q_post, checkpoint58r_post
Changes since 1.107: +7 -2 lines
Diff to previous 1.107
Hidden recomputation for GMREDI BOLUS


Revision 1.107 - (view) (download) (annotate) - [select for diffs]
Thu Jul 6 00:22:30 2006 UTC (17 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58k_post, checkpoint58l_post, checkpoint58m_post
Changes since 1.106: +7 -4 lines
Diff to previous 1.106
Fix line length problem for NLFS adjoint.


Revision 1.106 - (view) (download) (annotate) - [select for diffs]
Thu Jun 22 21:31:09 2006 UTC (17 years, 10 months ago) by heimbach
Branch: MAIN
Changes since 1.105: +13 -4 lines
Diff to previous 1.105
Remove a "hidden" recomputation in bottom_ctrl_5x5/
But does not reconcile G r a d accuracy w.r.t. reference.


Revision 1.105 - (view) (download) (annotate) - [select for diffs]
Sun Jun 18 23:22:43 2006 UTC (17 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.104: +49 -38 lines
Diff to previous 1.104
make a local copy of velocity to pass (like u,v,r_Trans) to tracer advection S/R


Revision 1.104 - (view) (download) (annotate) - [select for diffs]
Wed Jun 7 01:55:13 2006 UTC (17 years, 11 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58h_post, checkpoint58i_post, checkpoint58j_post
Changes since 1.103: +8 -6 lines
Diff to previous 1.103
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


Revision 1.103 - (view) (download) (annotate) - [select for diffs]
Thu Apr 20 03:29:35 2006 UTC (18 years ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58d_post, checkpoint58e_post, checkpoint58f_post, checkpoint58g_post
Changes since 1.102: +4 -2 lines
Diff to previous 1.102
Bracket Kuz, Kvz stores


Revision 1.102 - (view) (download) (annotate) - [select for diffs]
Tue Apr 4 14:52:43 2006 UTC (18 years, 1 month ago) by heimbach
Branch: MAIN
Changes since 1.101: +5 -7 lines
Diff to previous 1.101
Fix ptracers adjoint
o avoid extensive recomputatations
o fix missing re-init. of gptr (missed by TAF)


Revision 1.101 - (view) (download) (annotate) - [select for diffs]
Fri Mar 17 04:24:34 2006 UTC (18 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58c_post
Changes since 1.100: +7 -22 lines
Diff to previous 1.100
* use flag useOffLine rather than CPP #ifndef ALLOW_OFFLINE
* does not skip calls in initialization stage if using OffLine mode


Revision 1.100 - (view) (download) (annotate) - [select for diffs]
Wed Mar 8 06:36:39 2006 UTC (18 years, 2 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58b_post
Changes since 1.99: +10 -1 lines
Diff to previous 1.99
o Another overhaul of store dirs. for NLFS to eliminate
  "hidden" recomputations.
o TBD: "hidden" mom_vecinv recomp. in dynamics


Revision 1.99 - (view) (download) (annotate) - [select for diffs]
Mon Mar 6 18:25:49 2006 UTC (18 years, 2 months ago) by heimbach
Branch: MAIN
Changes since 1.98: +14 -11 lines
Diff to previous 1.98
o Fix PmEpR store for #undef EXACT_CONSERV
o Fix "hidden" recomp. in thermodynamics (no TAF warnings)
o Try to fix NLFS adjoint (hidden recomp in forward_step)


Revision 1.98 - (view) (download) (annotate) - [select for diffs]
Wed Mar 1 15:49:10 2006 UTC (18 years, 2 months ago) by heimbach
Branch: MAIN
Changes since 1.97: +1 -6 lines
Diff to previous 1.97
Adjust store directives to changes in gad_calc_rhs


Revision 1.97 - (view) (download) (annotate) - [select for diffs]
Wed Dec 14 22:49:22 2005 UTC (18 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57z_post, checkpoint58, checkpoint58a_post
Changes since 1.96: +25 -13 lines
Diff to previous 1.96
add IF (usePtracers) that was missing.


Revision 1.96 - (view) (download) (annotate) - [select for diffs]
Thu Dec 8 15:44:34 2005 UTC (18 years, 5 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint57y_post
Changes since 1.95: +18 -1 lines
Diff to previous 1.95
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


Revision 1.95 - (view) (download) (annotate) - [select for diffs]
Sun Nov 6 22:19:08 2005 UTC (18 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57x_post, checkpoint57y_pre
Changes since 1.94: +64 -22 lines
Diff to previous 1.94
Allow to apply AB on T,S rather than on AB(gT,gS):
 - implemented within #ifdef ALLOW_ADAMSBASHFORTH_3
 - use the same arrays (gtNm,gsNm) to hold tracer field at previous
   time-steps (if AB(T,S)) and tendencies (if AB(gT,gS)).


Revision 1.94 - (view) (download) (annotate) - [select for diffs]
Wed Aug 24 23:13:54 2005 UTC (18 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: checkpint57u_post, checkpoint57r_post, checkpoint57s_post, checkpoint57t_post, checkpoint57v_post, checkpoint57w_post
Changes since 1.93: +1 -5 lines
Diff to previous 1.93
remove MINIMAL_TAVE_OUTPUT option.


Revision 1.93 - (view) (download) (annotate) - [select for diffs]
Mon Jul 11 22:32:50 2005 UTC (18 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57l_post, checkpoint57m_post, checkpoint57n_post, checkpoint57o_post, checkpoint57p_post, checkpoint57q_post
Changes since 1.92: +1 -5 lines
Diff to previous 1.92
remove call to diagnostics_fill_surf_flux (badly placed, within bi,bj loop)


Revision 1.92 - (view) (download) (annotate) - [select for diffs]
Wed Apr 20 19:51:37 2005 UTC (19 years ago) by edhill
Branch: MAIN
CVS Tags: checkpoint57h_done, checkpoint57h_post, checkpoint57h_pre, checkpoint57i_post, checkpoint57j_post, checkpoint57k_post
Changes since 1.91: +2 -2 lines
Diff to previous 1.91
 o fix Samar's sloppiness: all code needs to be <73 characters long


Revision 1.91 - (view) (download) (annotate) - [select for diffs]
Wed Apr 20 15:52:22 2005 UTC (19 years ago) by spk
Branch: MAIN
Changes since 1.90: +14 -1 lines
Diff to previous 1.90
Added support for pkg/matrix


Revision 1.90 - (view) (download) (annotate) - [select for diffs]
Fri Apr 15 14:06:15 2005 UTC (19 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57g_post
Changes since 1.89: +9 -7 lines
Diff to previous 1.89
do not refer to gxNm1 if unnecessary (to work also with AB-3)


Revision 1.89 - (view) (download) (annotate) - [select for diffs]
Fri Mar 25 00:29:17 2005 UTC (19 years, 1 month ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint57f_post, checkpoint57f_pre, checkpoint57g_pre
Changes since 1.88: +4 -1 lines
Diff to previous 1.88
added storing of kappaRTr, kappaRk


Revision 1.88 - (view) (download) (annotate) - [select for diffs]
Fri Dec 17 19:17:56 2004 UTC (19 years, 4 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint57b_post, checkpoint57c_post, checkpoint57c_pre, checkpoint57d_post, checkpoint57e_post, eckpoint57e_pre
Changes since 1.87: +5 -1 lines
Diff to previous 1.87
o add surface flux diagnostics: TAUX, TAUY, TFLUX, TRELAX, TICE, SFLUX, SRELAX


Revision 1.87 - (view) (download) (annotate) - [select for diffs]
Thu Dec 16 23:20:06 2004 UTC (19 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.86: +5 -11 lines
Diff to previous 1.86
change argument list of S/R impldiff.F: tracerIdentity replace deltaT
 - allow to implement deltaT function of level k
 - make diagnostics easier


Revision 1.86 - (view) (download) (annotate) - [select for diffs]
Sun Dec 5 22:23:17 2004 UTC (19 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57, checkpoint57a_post, checkpoint57a_pre
Changes since 1.85: +6 -4 lines
Diff to previous 1.85
implement Implicit Vertical advection for pTracers


Revision 1.85 - (view) (download) (annotate) - [select for diffs]
Sat Dec 4 05:59:50 2004 UTC (19 years, 5 months ago) by dimitri
Branch: MAIN
Changes since 1.84: +5 -5 lines
Diff to previous 1.84
Added CPP option MINIMAL_TAVE_OUTPUT for minimal time-averaged output:
S, T, U, V, W, ETA, and phiHydLow.


Revision 1.84 - (view) (download) (annotate) - [select for diffs]
Sat Dec 4 00:12:14 2004 UTC (19 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.83: +11 -5 lines
Diff to previous 1.83
depth convergence accelerator: replace deltaTtracer by dTtracerLev(k)


Revision 1.83 - (view) (download) (annotate) - [select for diffs]
Fri Dec 3 15:39:11 2004 UTC (19 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.82: +6 -1 lines
Diff to previous 1.82
allow to compile without generic_advdiff pkg.


Revision 1.82 - (view) (download) (annotate) - [select for diffs]
Tue Nov 2 20:41:30 2004 UTC (19 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint55j_post, checkpoint56, checkpoint56a_post, checkpoint56b_post, checkpoint56c_post
Changes since 1.81: +1 -4 lines
Diff to previous 1.81
removed unused arrays


Revision 1.81 - (view) (download) (annotate) - [select for diffs]
Thu Oct 28 00:30:57 2004 UTC (19 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint55i_post
Changes since 1.80: +78 -43 lines
Diff to previous 1.80
Change arrays for total vertical diffusivity (2.D explicit, 3.D implicit)


Revision 1.80 - (view) (download) (annotate) - [select for diffs]
Thu Oct 21 21:25:32 2004 UTC (19 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.79: +5 -4 lines
Diff to previous 1.79
Explicit vertical diffusivity: use a 2.D vertical diffusivity array


Revision 1.79 - (view) (download) (annotate) - [select for diffs]
Tue Oct 19 02:39:58 2004 UTC (19 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint55h_post
Changes since 1.78: +2 -3 lines
Diff to previous 1.78
use flags: fluidIsAir/Water, usingP/ZCoords instead of buoyancyRelation


Revision 1.78 - (view) (download) (annotate) - [select for diffs]
Fri Sep 17 23:02:00 2004 UTC (19 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint55, checkpoint55a_post, checkpoint55b_post, checkpoint55c_post, checkpoint55d_post, checkpoint55d_pre, checkpoint55e_post, checkpoint55f_post, checkpoint55g_post
Changes since 1.77: +1 -57 lines
Diff to previous 1.77
o bringing adjoint up to date for sheduled c55


Revision 1.77 - (view) (download) (annotate) - [select for diffs]
Thu Sep 16 09:46:28 2004 UTC (19 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint54f_post
Changes since 1.76: +2 -2 lines
Diff to previous 1.76
o packages PP81, MY82, and GGL90 have variable diffusivity
  - include them to the list/logical variableK


Revision 1.76 - (view) (download) (annotate) - [select for diffs]
Thu Sep 2 09:13:49 2004 UTC (19 years, 8 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint54e_post
Changes since 1.75: +3 -2 lines
Diff to previous 1.75
o add calls for two new packages
  - pp81 (Packanowski and Philander, 1981), Richardson number and
    stratification dependent mixing
  - my82 (Mellor and Yamada, 1982) level 2 turbulence closure scheme


Revision 1.75 - (view) (download) (annotate) - [select for diffs]
Wed Sep 1 16:25:06 2004 UTC (19 years, 8 months ago) by stephd
Branch: MAIN
Changes since 1.74: +19 -1 lines
Diff to previous 1.74
o adding offline package


Revision 1.74 - (view) (download) (annotate) - [select for diffs]
Tue Jul 13 16:48:48 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint54c_post, checkpoint54d_post
Changes since 1.73: +2 -4 lines
Diff to previous 1.73
max number of passive tracers is now defined in PTRACERS_SIZE.h


Revision 1.73 - (view) (download) (annotate) - [select for diffs]
Wed Jul 7 01:32:11 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint54b_post
Changes since 1.72: +5 -1 lines
Diff to previous 1.72
try to keep an accurate diagnostic of timeave_surf_flux


Revision 1.72 - (view) (download) (annotate) - [select for diffs]
Tue Jul 6 00:58:40 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint54a_post
Changes since 1.71: +5 -254 lines
Diff to previous 1.71
take out 1rst part of thermodynamics (KPP,GM,slope ..) into do_oceanic_phys.F


Revision 1.71 - (view) (download) (annotate) - [select for diffs]
Fri Jul 2 15:50:24 2004 UTC (19 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint53g_post, checkpoint54, checkpoint54a_pre
Changes since 1.70: +1 -3 lines
Diff to previous 1.70
Keeping up with JMC's latest modifs.


Revision 1.70 - (view) (download) (annotate) - [select for diffs]
Thu Jul 1 21:45:11 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.69: +2 -12 lines
Diff to previous 1.69
prepare splitting of thermodynamics: store convective counter in common block


Revision 1.69 - (view) (download) (annotate) - [select for diffs]
Sat Jun 26 02:38:09 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
Changes since 1.68: +5 -3 lines
Diff to previous 1.68
T & S: separate Vert.Advec.Scheme from horizontal Advec.Scheme


Revision 1.68 - (view) (download) (annotate) - [select for diffs]
Fri May 21 21:45:35 2004 UTC (19 years, 11 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint53c_post, checkpoint53d_post, checkpoint53d_pre, checkpoint53f_post
Changes since 1.67: +4 -4 lines
Diff to previous 1.67
o Adjoint for EBM package (needs further testing)
o bug fix for parallel EBM in ebm_zonalmean.F


Revision 1.67 - (view) (download) (annotate) - [select for diffs]
Fri May 14 21:08:28 2004 UTC (20 years ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint53b_post
Changes since 1.66: +4 -1 lines
Diff to previous 1.66
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.


Revision 1.66 - (view) (download) (annotate) - [select for diffs]
Wed Feb 18 22:23:18 2004 UTC (20 years, 2 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint52j_post, checkpoint52k_post, checkpoint52l_post, checkpoint52l_pre, checkpoint52m_post, checkpoint52n_post, checkpoint53, checkpoint53a_post, checkpoint53b_pre, hrcube5
Changes since 1.65: +11 -4 lines
Diff to previous 1.65
Bringing flow and store directives up-to-date


Revision 1.65 - (view) (download) (annotate) - [select for diffs]
Sun Jan 25 00:31:52 2004 UTC (20 years, 3 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint52j_pre, hrcube4, hrcube_2, hrcube_3
Changes since 1.64: +3 -1 lines
Diff to previous 1.64
o limit timeave output for hi-res integrations


Revision 1.64 - (view) (download) (annotate) - [select for diffs]
Wed Jan 7 21:18:01 2004 UTC (20 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint52e_post, checkpoint52f_post, checkpoint52f_pre, checkpoint52h_pre, checkpoint52i_post, checkpoint52i_pre, hrcube_1
Changes since 1.63: +33 -5 lines
Diff to previous 1.63
rewrite (as in MultiDimAdvec) explicit tracer stepping (gad_calc_rhs.F)
 to work with implicit vertical advection and AB


Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Sat Jan 3 01:01:34 2004 UTC (20 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.62: +55 -30 lines
Diff to previous 1.62
add calls for implicit vertical direction (advection & diffusion)
    but keep impldiff for implicit diffusion & viscosity only.


Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Tue Dec 30 02:33:42 2003 UTC (20 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint52e_pre
Changes since 1.61: +3 -1 lines
Diff to previous 1.61
don't call external_forcing_surf in atmospheric simulation


Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Sun Nov 23 01:28:05 2003 UTC (20 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: branch-netcdf, checkpoint52b_post, checkpoint52c_post, checkpoint52d_post, checkpoint52d_pre
Branch point for: netcdf-sm0
Changes since 1.60: +2 -38 lines
Diff to previous 1.60
use the new thermodynamic Sea-Ice pkg: thSIce


Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Thu Nov 20 03:46:07 2003 UTC (20 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint52b_pre
Changes since 1.59: +4 -4 lines
Diff to previous 1.59
add PTRACERS_OPTIONS.h (needed in forward mode, for NUMBER_OF_PTRACERS)


Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Thu Nov 13 21:54:11 2003 UTC (20 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint52a_post
Changes since 1.58: +12 -12 lines
Diff to previous 1.58
additional changes for FREEZE:
 - new S/R FREEZE_SURFACE only apllied to surface level.
 - add run-time parameter "useOldFreezing" to use the old version "FREEZE"


Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Thu Nov 13 06:35:14 2003 UTC (20 years, 6 months ago) by dimitri
Branch: MAIN
Changes since 1.57: +12 -13 lines
Diff to previous 1.57
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


Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Thu Nov 6 22:01:43 2003 UTC (20 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51u_post, checkpoint52, checkpoint52a_pre, ecco_c52_e35
Changes since 1.56: +8 -1 lines
Diff to previous 1.56
o merging from ecco-branch
o minor CPP options update


Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Tue Nov 4 18:40:58 2003 UTC (20 years, 6 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51s_post, checkpoint51t_post
Changes since 1.55: +18 -18 lines
Diff to previous 1.55
 o cleanup: convert '#ifndef DISABLE_DEBUGMODE"' to '#ifdef ALLOW_DEBUG"'


Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Sun Oct 26 01:10:12 2003 UTC (20 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51o_post, checkpoint51p_post, checkpoint51q_post, checkpoint51r_post
Branch point for: branch-nonh
Changes since 1.54: +16 -3 lines
Diff to previous 1.54
o initialisation of rFlx extended to full array (required by TAF)
  and shifted to thermodynamics
o removed PTRACERS.h in ptracers routine
o added surfacetendencyPtr to S/R parameter list pracers_forcing


Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Fri Oct 24 05:29:35 2003 UTC (20 years, 6 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51o_pre
Changes since 1.53: +27 -1 lines
Diff to previous 1.53
 o undid all of the cp51 checkin pending some ongoing code cleanups
   and discussion


Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Thu Oct 23 07:14:49 2003 UTC (20 years, 6 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint51n_post
Branch point for: checkpoint51n_branch
Changes since 1.52: +1 -27 lines
Diff to previous 1.52
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


Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Fri Oct 10 22:56:08 2003 UTC (20 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51j_post, checkpoint51k_post, checkpoint51l_post, checkpoint51l_pre, checkpoint51m_post, checkpoint51n_pre
Branch point for: tg2-branch
Changes since 1.51: +7 -8 lines
Diff to previous 1.51
adjusted some flow directives


Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Thu Oct 9 04:19:18 2003 UTC (20 years, 7 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51i_post
Changes since 1.50: +8 -1 lines
Diff to previous 1.50
 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


Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Tue Oct 7 04:31:30 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint51i_pre
Changes since 1.49: +7 -2 lines
Diff to previous 1.49
fix Problem with bulk_force & therm_seaice.


Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Thu Oct 2 21:33:54 2003 UTC (20 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51g_post, checkpoint51h_pre
Changes since 1.48: +2 -8 lines
Diff to previous 1.48
Bringing code up to date for AD
o remove some IF-statements which cause excessive dependencies
o provide interface for ADM*TLM


Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Thu Sep 25 03:01:59 2003 UTC (20 years, 7 months ago) by dimitri
Branch: MAIN
CVS Tags: branchpoint-genmake2, checkpoint51f_post
Branch point for: branch-genmake2
Changes since 1.47: +4 -4 lines
Diff to previous 1.47
o Mods and bug fixes to pkg/cal, pkg/exf, etc., needed for computation
  of tracer Green's fucntions for ocean inversion project.


Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Wed Sep 24 04:52:38 2003 UTC (20 years, 7 months ago) by dimitri
Branch: MAIN
Changes since 1.46: +2 -2 lines
Diff to previous 1.46
o Mods and bug fixes to pkg/cal, pkg/exf, etc. needed for computation
  of tracer Green's fucntions for ocean inversion project.


Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Tue Sep 23 05:31:30 2003 UTC (20 years, 7 months ago) by dimitri
Branch: MAIN
Changes since 1.45: +4 -4 lines
Diff to previous 1.45
o Mods and bug fixes to pkg/cal and pkg/exf needed for computation
  of tracer Green's fucntions for ocean inversion project.


Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Mon Sep 22 22:12:05 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
Changes since 1.44: +8 -7 lines
Diff to previous 1.44
initialize tendency to zero : proposed by Martin to fix the bug when
 setting temp/salt advection=.false.


Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Fri Jul 11 16:00:08 2003 UTC (20 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint51e_post, checkpoint51f_pre
Changes since 1.43: +17 -24 lines
Diff to previous 1.43
put thermSeaIce CALL(s) within if (useThermSeaIce) block


Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Tue Jul 8 15:00:26 2003 UTC (20 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51c_post, checkpoint51d_post
Changes since 1.42: +33 -17 lines
Diff to previous 1.42
o introducing integer flag debugLevel
o introducing pathname variable mdsioLocalDir for mdsio


Revision 1.42 - (view) (download) (annotate) - [select for diffs]
Fri Jun 27 01:51:10 2003 UTC (20 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51b_post
Changes since 1.41: +28 -11 lines
Diff to previous 1.41
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM


Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Mon Jun 23 22:32:02 2003 UTC (20 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint50i_post, checkpoint51, checkpoint51a_post, checkpoint51b_pre
Changes since 1.40: +15 -21 lines
Diff to previous 1.40
Preparing next differentiable checkpoint and sync
of MAIN vs. ecco-branch
(updating store after changes in checkpoint50b_post,
plus still messing around with init. sequence).


Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Tue May 13 17:42:00 2003 UTC (21 years ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint50e_post, checkpoint50e_pre, checkpoint50f_post, checkpoint50f_pre, checkpoint50g_post, checkpoint50h_post
Changes since 1.39: +53 -1 lines
Diff to previous 1.39
Extended pkg/debug and instrumented main code to help track down fatal
errors.


Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Thu May 1 22:30:33 2003 UTC (21 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint50c_post, checkpoint50d_post, checkpoint50d_pre
Changes since 1.38: +21 -25 lines
Diff to previous 1.38
fix bug in convective adj. diagnostic (ConvectCount is a local array !)
and add time-average diagnostic of U*V and diff_Kr*theta


Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Fri Feb 28 02:20:52 2003 UTC (21 years, 2 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint48i_post, checkpoint49, checkpoint50, checkpoint50a_post, checkpoint50b_post, checkpoint50b_pre, checkpoint50c_pre
Changes since 1.37: +3 -7 lines
Diff to previous 1.37
Changes to restore differentiability of code w.r.t. previous tag
(mostly adding new routines to make list and replacing
pressure by totPhiHyd).


Revision 1.37 - (view) (download) (annotate) - [select for diffs]
Fri Feb 7 21:59:53 2003 UTC (21 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint48d_post, checkpoint48d_pre, checkpoint48e_post, checkpoint48f_post, checkpoint48g_post, checkpoint48h_post
Changes since 1.36: +2 -9 lines
Diff to previous 1.36
remove unused phiHyd


Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Tue Jan 21 19:19:45 2003 UTC (21 years, 3 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint47j_post, checkpoint48, checkpoint48a_post, checkpoint48b_post, checkpoint48c_post, checkpoint48c_pre
Changes since 1.35: +4 -1 lines
Diff to previous 1.35
Dummy init. of visbeckK for TAF.


Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Fri Jan 10 23:41:15 2003 UTC (21 years, 4 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint47h_post, checkpoint47i_post
Changes since 1.34: +12 -1 lines
Diff to previous 1.34
o few modif.'s to get latest version adjointed
  (mainly kick out code in ini_linear_phisurf)
o modif's to run adjoint with exactConserv
o case GM_BOLUS_ADVEC should be cleaned
  S/R gmredi_slope_psi should be cleaned
o verification/carbon now has exactConserv=.TRUE.


Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Fri Jan 10 19:06:05 2003 UTC (21 years, 4 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint47g_post
Changes since 1.33: +7 -4 lines
Diff to previous 1.33
Adjusting one storing for case GM_BOLUS_ADVECT


Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Fri Nov 22 03:01:18 2002 UTC (21 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: branch-exfmods-tag, checkpoint47a_post, checkpoint47b_post, checkpoint47c_post, checkpoint47d_post, checkpoint47d_pre, checkpoint47e_post, checkpoint47f_post
Branch point for: branch-exfmods-curt
Changes since 1.32: +4 -5 lines
Diff to previous 1.32
modification needed for the new AIM package (aim_v23)


Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Thu Nov 21 19:11:42 2002 UTC (21 years, 5 months ago) by cheisey
Branch: MAIN
Changes since 1.31: +11 -4 lines
Diff to previous 1.31
Two packages:  bulk_force (Bulk forcing)
and therm_seaice (thermodynamic_seaice) - adopted from LANL CICE.v2.0.2
Earlier integration from Stephaine Dutkiewicz
and Patrick Heimbach.

Two ifdef statements for compile time,
ALLOW_THERM_SEAICE and ALLOW_BULK_FORCE

Two switches in data.pkg to turn on at run-time:

cat data.pkg
# Packages
 &PACKAGES
 useBulkForce=.TRUE.,
 useThermSeaIce=.TRUE.,
 &

WARNING:  useSEAICE and useThermSEAICE are mutually exclusive.

The bulk package requires an additional parameter file
with two namelists, data.ice and data.blk.

c ADAPTED FROM:
c LANL CICE.v2.0.2
c-----------------------------------------------------------------------
c.. thermodynamics (vertical physics) based on M. Winton 3-layer model
c.. See Bitz, C. M. and W. H. Lipscomb, 1999:  "An energy-conserving
c..       thermodynamic sea ice model for climate study."  J. Geophys.
c..       Res., 104, 15669 - 15677.
c..     Winton, M., 1999:  "A reformulated three-layer sea ice model."
c..       Submitted to J. Atmos. Ocean. Technol.

c.. authors Elizabeth C. Hunke and William Lipscomb
c..         Fluid Dynamics Group, Los Alamos National Laboratory
c-----------------------------------------------------------------------


Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Fri Nov 15 19:58:21 2002 UTC (21 years, 5 months ago) by cheisey
Branch: MAIN
Changes since 1.30: +38 -2 lines
Diff to previous 1.30
Two packages:  bulk_forcing (Bulk forcing)
and thermodynamic_seaice (adapted from LANL CICE.v2.0.2)
Earlier integration from Stephaine Dutkiewicz
and Patrick Heimbach.

Two ifdef statements for compile time,
ALLOW_TSEAICE and ALLOW_BULKFORMULA

Two switches in data.pkg to turn on at run-time:

cat data.pkg
# Packages
 &PACKAGES
 useBulkf=.TRUE.,
 useTSeaIce=.TRUE.,
 &

The bulk package requires an additional parameter file
with two namelists.

 cat data.blk
 &BULKF_PARM01
 RainFile=       'ncep_precip_m_cubed.bin',
 SolarFile=      'ncep_downsolr_cubed.bin',
 AirTempFile=    'ncep_tair_cubed.bin',
 AirhumidityFile='ncep_qair_g_cubed.bin',
 LongwaveFile=   'ncep_netlw_cubed.bin',
 UWindFile=      'ncep_uwind_cubed.bin',
 VWindFile=      'ncep_vwind_cubed.bin',
 WspeedFile=    ' ',
 RunoffFile=    ' ',
 QnetFile=       ' ',
 EmPFile=        'ncep_emp_calc_cubed.bin',
 CloudFile=      'ncep_totalcloud_cubed.bin',
 &

 &BULKF_PARM02
 qnet_off=0.0,
 empmr_off=0.0,
 conservcycle=311040000.,
 &



c ADAPTED FROM:
c LANL CICE.v2.0.2
c-----------------------------------------------------------------------
c.. thermodynamics (vertical physics) based on M. Winton 3-layer model
c.. See Bitz, C. M. and W. H. Lipscomb, 1999:  "An energy-conserving
c..       thermodynamic sea ice model for climate study."  J. Geophys.
c..       Res., 104, 15669 - 15677.
c..     Winton, M., 1999:  "A reformulated three-layer sea ice model."
c..       Submitted to J. Atmos. Ocean. Technol.

c.. authors Elizabeth C. Hunke and William Lipscomb
c..         Fluid Dynamics Group, Los Alamos National Laboratory
c-----------------------------------------------------------------------

WARNING:  useSEAICE and useTSEAICE are mutually exclusive.

todo: thermodynamic.F should be reviewed and cleaned up a bit.


Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Fri Nov 15 03:01:21 2002 UTC (21 years, 5 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint47
Changes since 1.29: +67 -46 lines
Diff to previous 1.29
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


Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Tue Nov 12 20:45:41 2002 UTC (21 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint46n_post
Changes since 1.28: +2 -2 lines
Diff to previous 1.28
Merging from release1_p8 branch:
Adding package parameters and hooks for new seaice package.


Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Wed Oct 9 00:57:57 2002 UTC (21 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint46k_post, checkpoint46l_post, checkpoint46l_pre, checkpoint46m_post
Changes since 1.27: +2 -2 lines
Diff to previous 1.27
* S/R aim_initialise.F replace S/R aim_init from file aim_do_inphys.F:
 - read AIM physics parameters from a file (data.aimphys)
 - set defaults values = F.Molteni paper (Clim.Dyn., 2002)
 - phiHyd removed from arg. list of S/R aim_do_atmos_physics


Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Mon Oct 7 16:24:45 2002 UTC (21 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint46j_post
Changes since 1.26: +21 -21 lines
Diff to previous 1.26
* split calc_exact_eta in 2 S/R : integr_continuity & update_etaH
* move wVel computation at the end of the time step, in S/R integr_continuity
* create specific S/R to exchange T,S before DYNAMICS (for stagger time step)
* update timeave pkg for wVel diagnostic ; put convertEmP2rUnit in PARAMS.h


Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Wed Sep 18 16:38:02 2002 UTC (21 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint46g_post, checkpoint46h_post, checkpoint46h_pre, checkpoint46i_post, checkpoint46j_pre
Changes since 1.25: +3 -3 lines
Diff to previous 1.25
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)


Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Sat Jul 13 04:59:42 2002 UTC (21 years, 10 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint46, checkpoint46a_post, checkpoint46a_pre, checkpoint46b_post, checkpoint46b_pre, checkpoint46c_post, checkpoint46c_pre, checkpoint46d_post, checkpoint46d_pre, checkpoint46e_post, checkpoint46e_pre, checkpoint46f_post, checkpoint46g_pre
Changes since 1.24: +1 -14 lines
Diff to previous 1.24
Merging from release1_p5 (cf. tag-index for checkpoint46).


Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Wed Jul 3 20:22:39 2002 UTC (21 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint45d_post
Changes since 1.23: +13 -10 lines
Diff to previous 1.23
Oly must be > 3 when using an advection scheme other than 2nd O  and
 staggerTimeStep & multiDimAdvection & GM_AdvForm & not.GM_AdvSeparate
Add an exchange of gT,gS in this case.


Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Sat Jun 15 03:28:39 2002 UTC (21 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.22: +4 -12 lines
Diff to previous 1.22
Add new flags:
* T,S forcing outside Adams-Bashforh
* temp,salt Advection and Forcing (turn on/off)
* for each tracer: internal flag for multiDimAdvection & A-B


Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Thu May 30 02:31:01 2002 UTC (21 years, 11 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint45b_post, checkpoint45c_post
Changes since 1.21: +18 -1 lines
Diff to previous 1.21
Included CPP option SINGLE_LAYER_MODE
to configure barotropic setup (Martin Losch).


Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Tue Apr 30 22:53:17 2002 UTC (22 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint45a_post
Changes since 1.20: +11 -9 lines
Diff to previous 1.20
extend the computation domain of Rho to cover the whole domain.
 (necessary when using GM-Advect form + stagger time step with Olx=Oly=3)


Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Sun Mar 24 02:36:39 2002 UTC (22 years, 1 month ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint44h_post, checkpoint45
Changes since 1.19: +21 -13 lines
Diff to previous 1.19
o Modified initialisations to break adjoint dependencies
o removed some store directives
o added options files for KPP, GMREDI


Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Wed Mar 6 01:59:02 2002 UTC (22 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint44h_pre
Changes since 1.18: +11 -1 lines
Diff to previous 1.18
add GM-bolus transport to Eulerian transport to advect Tracers (T,S, ...)


Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Tue Mar 5 14:15:34 2002 UTC (22 years, 2 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint44f_post, checkpoint44g_post
Changes since 1.17: +6 -2 lines
Diff to previous 1.17
Bug fix: Missing #ifdef's for when PTRACERS are not enabled.


Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Mon Mar 4 17:26:41 2002 UTC (22 years, 2 months ago) by adcroft
Branch: MAIN
Changes since 1.16: +40 -1 lines
Diff to previous 1.16
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.


Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Fri Feb 8 22:15:33 2002 UTC (22 years, 3 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint44e_post, checkpoint44e_pre, checkpoint44f_pre, chkpt44c_post, chkpt44d_post
Branch point for: release1_final
Changes since 1.15: +2 -2 lines
Diff to previous 1.15
add argument myIter to S/R obcs_calc


Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Sun Dec 16 18:46:22 2001 UTC (22 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint43a-release1mods, checkpoint44, checkpoint44b_post, checkpoint44b_pre, chkpt44a_post, chkpt44a_pre, chkpt44c_pre, release1-branch-end, release1-branch_branchpoint, release1-branch_tutorials
Branch point for: release1-branch
Changes since 1.14: +5 -9 lines
Diff to previous 1.14
put the k loop inside S/R gmredi_calc_tensor


Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Fri Nov 16 03:25:41 2001 UTC (22 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.13: +8 -6 lines
Diff to previous 1.13
fix diagnostic of convective adjustment (IVDC)
 (broken since thermo-/dynamics split)


Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Fri Sep 28 03:36:16 2001 UTC (22 years, 7 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint43, ecco-branch-mod1, release1_b1, release1_beta1
Branch point for: ecco-branch, release1, release1_coupled
Changes since 1.12: +9 -7 lines
Diff to previous 1.12
Removed CPP connection between DISABLE_MULTIDIM_ADVECTION and
ALLOW_AUTODIFF_TAMC.
 o ie. removed #ifdef ALLOW_AUTODIFF_TAMC from GAD_OPTIONS.h
 o updated comments in thermodynamics.F to reflect this change


Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Fri Sep 28 02:26:57 2001 UTC (22 years, 7 months ago) by adcroft
Branch: MAIN
Changes since 1.11: +9 -4 lines
Diff to previous 1.11
Switched sense of CPP macro for controlling multi-dimensional advection:
 o DISABLE_MULTIDIM_ADVECTION is set in GAD_OPTIONS.h
 o automatically set if differentiating code
   (comments around call to gad_advection point out how to re-enable it)
 o this avoids needing to add the former macro to CPP_OPTIONS.h
   - reason for this is there's no point in any of the new schemes without it.


Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Thu Sep 27 20:12:10 2001 UTC (22 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint42
Changes since 1.10: +30 -30 lines
Diff to previous 1.10
Fixed AD-related problems:
o Store directives up-to-date with re-arranged Adams-Bashforth
  (mainly thermodynamics.F)
o New store directives for multi-dim. advection schemes
  * new CPP flag ALLOW_MULTI_DIM_ADVECTION
  * new common block and key passkey
  (mainly gad_advection.F)
o Modified store directives for split of dynamics/thermodynamics
  for the case ALLOW_KPP
o Cleaned argument list for timestep_tracer.F


Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Thu Sep 27 18:06:43 2001 UTC (22 years, 7 months ago) by adcroft
Branch: MAIN
Changes since 1.9: +3 -3 lines
Diff to previous 1.9
Deleted apostrophies in comments: "Isn't" breaks cpp...


Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Wed Sep 26 18:09:16 2001 UTC (22 years, 7 months ago) by cnh
Branch: MAIN
CVS Tags: checkpoint41
Changes since 1.8: +61 -57 lines
Diff to previous 1.8
Bringing comments up to data and formatting for document extraction.


Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Wed Sep 19 16:07:28 2001 UTC (22 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint40
Changes since 1.7: +3 -3 lines
Diff to previous 1.7
Corrected parameter lists for case tr1stepping.


Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Wed Sep 19 02:43:27 2001 UTC (22 years, 7 months ago) by adcroft
Branch: MAIN
Changes since 1.6: +13 -13 lines
Diff to previous 1.6
Re-arranged sequence of operations for Adams-Bashforth
 o this does not change numbers
 o this makes it very easy to extract forcing/diffusion out of ABII
   by changing calling sequence in calc_gt, calc_gs,...

Key modifications:
 o new s/r: ADAMS_BASHFORTH2  gT=3/2*gT-1/2*gTnm1
 o changed TIMESTEP_TRACER from gTnm1=t+dt*(3/2*gT-1/2*gTnm1)
   to  gT=T+dt*gT
 o changed CALC_GT,CALC_GS & CALC_GTR1 to calcuate "gT" defined
   by new timestep_tracer (ie. including forcing, ABII, N-L F-S, etc...)
   now calls ADAMS_BASHFORTH2 and FREESURF_RESCALE_G
 o changed CYCLE_TRACER appropriately  T=gT only

Other associated mods:
 o new s/r: FREESURF_RESCALE_G applies non-linear free-surface term
   this used to be in TIMESTEP_TRACER
 o added myIter as argument to CALC_GS,CALC_GT,CALC_GTR1


Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Fri Sep 14 17:22:58 2001 UTC (22 years, 7 months ago) by adcroft
Branch: MAIN
Changes since 1.5: +17 -17 lines
Diff to previous 1.5
Reinstate calls to advection routines after gratuitous commenting removed
them in previous update! :^)


Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Mon Sep 10 16:35:27 2001 UTC (22 years, 8 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint40pre9
Changes since 1.4: +24 -17 lines
Diff to previous 1.4
Include initialisation of gTracer fields to break
dependency for TAF.


Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Mon Sep 10 01:22:48 2001 UTC (22 years, 8 months ago) by adcroft
Branch: MAIN
Changes since 1.3: +21 -1 lines
Diff to previous 1.3
Added multi-dimensional form of advection
 o available only for single step schemes (ie. can't be used with ABII)
 o stable for max(cfl_u,cfl_v,cfl_w)<=1  (without cfl_u+cfl_v+cfl_w <=1)
 o selected using multiDimAdvection=.T.  (default)
 o had to hack some existing routines to work on local arrays


Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Wed Aug 15 15:51:46 2001 UTC (22 years, 8 months ago) by adcroft
Branch: MAIN
CVS Tags: checkpoint40pre8
Changes since 1.2: +4 -9 lines
Diff to previous 1.2
Added run-time control of advection schemes.
 - advection scheme determines method of forward integration.
 - unfortunately, we have to use integers in "data" since ENUM_CENTERED_2ND
   doesn't mean anything to fortran
 - defaults are centered second
 - output differs due to these mods! This is due to the g77 optimization.
   I have tested that using -ffloat-store, these mods do not affect
   the output so am confident about changes.

                T           S           U           V
C D M    c        m  s        m  s        m  s        m  s
n p a R  g  m  m  e  .  m  m  e  .  m  m  e  .  m  m  e  .
f n k u  2  i  a  a  d  i  a  a  d  i  a  a  d  i  a  a  d
g d e n  d  n  x  n  .  n  x  n  .  n  x  n  .  n  x  n  .

Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 22 16 16 pass  adjustment.128x64x1
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass  adjustment.cs-32x32x1
Y Y N N -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- N/O   aim.5l_Equatorial_Channel
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass  aim.5l_LatLon
Y Y N N -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- N/O   aim.5l_zon-ave
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 22 16 pass  exp0
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 22 16 pass  exp1
Y Y Y Y 13 16 16 16 16 16 16 16 13 16 13 13 13 13 13 13 16 pass  exp2
Y Y Y Y 12 16 16 13 16 16 16 16 16 13 16 16 16 16 13 13 16 FAIL  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 16 16 16 16 16 16 16 16 16 16 16 22 16 16 16 11 16 pass  hs94.128x64x5
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 22 16 pass  hs94.1x64x5
Y Y Y Y 14 16 16 16 16 16 16 16 16 16 13 16 16 16 16 16 13 pass  hs94.cs-32x32x5
Y Y Y Y 16 16 16 22 16 16 16 16 16 16 16 22 16 16 16 16 16 pass  internal_wave
Y Y Y Y 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 16 pass  natl_box
Y Y Y Y 16 16 16 16 16 13 16 13 16 16 16 16 16 16 16 16 16 pass  solid-body.cs-32x32x1


Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Mon Aug 13 18:05:26 2001 UTC (22 years, 9 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint40pre6, checkpoint40pre7
Changes since 1.1: +4 -19 lines
Diff to previous 1.1
Modifications related to split into thermodynamics.F, dynamics.F
o missing initialisations in dynamics.F added
o some fields no longer needed in dynamics/thermodynamics deleted
o split of calc_diffusivity.F into calc_viscosity.F
  (plus split of kpp_calc_diff.F into kpp_calc_visc.F)
o Modifications of some store directives for TAF


Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Fri Aug 3 19:06:11 2001 UTC (22 years, 9 months ago) by adcroft
Branch: MAIN
Split dynamics.F into dynamics.F and thermodynamics.F
 - idea is to make algorithm more transparent???
 - probably less efficient
 - has exchanges at end of thermodynamics.F (which are needed
   if using staggered time-stepping with the cube OR using AIM.


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.

  Diffs between and
  Type of Diff should be a

Sort log by:

  ViewVC Help
Powered by ViewVC 1.1.22