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

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

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

Links to HEAD: (view) (download) (annotate)
Links to checkpoint64b: (view) (download) (annotate)
Sticky Tag:
Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Thu Dec 22 19:00:58 2011 UTC (12 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: HEAD, checkpoint63h, checkpoint63i, checkpoint63j, checkpoint63k, checkpoint63l, checkpoint63m, checkpoint63n, checkpoint63o, checkpoint63p, checkpoint63q, checkpoint63r, checkpoint63s, checkpoint64, checkpoint64a, checkpoint64b, checkpoint64c, checkpoint64d, checkpoint64e, checkpoint64f, checkpoint64g, checkpoint64h, checkpoint64i, checkpoint64j, checkpoint64k, checkpoint64l, checkpoint64m, checkpoint64n, checkpoint64o, checkpoint64p, checkpoint64q, checkpoint64r, checkpoint64s, checkpoint64t, checkpoint64u, checkpoint64v, checkpoint64w, checkpoint64x, checkpoint64y, checkpoint64z, checkpoint65, checkpoint65a, checkpoint65b, checkpoint65c, checkpoint65d, checkpoint65e, checkpoint65f, checkpoint65g, checkpoint65h, checkpoint65i, checkpoint65j, checkpoint65k, checkpoint65l, checkpoint65m, checkpoint65n, checkpoint65o, checkpoint65p, checkpoint65q, checkpoint65r, checkpoint65s, checkpoint65t, checkpoint65u, checkpoint65v, checkpoint65w, checkpoint65x, checkpoint65y, checkpoint65z, checkpoint66a, checkpoint66b, checkpoint66c, checkpoint66d, checkpoint66e, checkpoint66f, checkpoint66g, checkpoint66h, checkpoint66i, checkpoint66j, checkpoint66k, checkpoint66l, checkpoint66m, checkpoint66n, checkpoint66o
Changes since 1.27: +17 -13 lines
Diff to previous 1.27 
remove/avoid un-used variables
Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Thu Dec 8 22:35:43 2011 UTC (12 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63g
Changes since 1.26: +15 -3 lines
Diff to previous 1.26 
take sigma-coords related code out of update_etah.F into new S/R UPDATE_ETAWS
Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Sun Nov 13 01:44:14 2011 UTC (12 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63f
Changes since 1.25: +45 -20 lines
Diff to previous 1.25 
- move bi,bj loops inside INTEGR_CONTINUITY ;
- call INTEGR_CONTINUITY directly from forward_step.F
  (previously called from momentum_correction_step.F)
- call UPDATE_ETAH from integr_continuity.F and update initialise_varia.F,
  forward_step.F and pkg/ecco/the_main_loop.F
Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Mon May 23 00:39:20 2011 UTC (13 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62y, checkpoint62z, checkpoint63, checkpoint63a, checkpoint63b, checkpoint63c, checkpoint63d, checkpoint63e
Changes since 1.24: +13 -7 lines
Diff to previous 1.24 
use new local variable rStarDhDt (instead of common block variable rStarDhCDt)
to pass as argument to S/R INTEGRATE_FOR_W.
Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Fri May 20 18:52:17 2011 UTC (13 years ago) by mmazloff
Branch: MAIN
Changes since 1.23: +3 -3 lines
Diff to previous 1.23 
needed for resetting W to zero outside the OB interior region for no exact_conserve but using obcs
Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Fri May 20 16:26:35 2011 UTC (13 years ago) by jmc
Branch: MAIN
Changes since 1.22: +36 -12 lines
Diff to previous 1.22 
OBCS changes: - reset dEtaHdt and wVel to zero outside OB interior region;
 - call OBCS_APPLY_W only if NonHydrostatic
 - comment out call to OBCS_APPLY_ETA(etaN).
Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Sat Nov 28 20:59:18 2009 UTC (14 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61z, checkpoint62, checkpoint62a, checkpoint62b, checkpoint62c, checkpoint62d, checkpoint62e, checkpoint62f, checkpoint62g, checkpoint62h, checkpoint62i, checkpoint62j, checkpoint62k, checkpoint62l, checkpoint62m, checkpoint62n, checkpoint62o, checkpoint62p, checkpoint62q, checkpoint62r, checkpoint62s, checkpoint62t, checkpoint62u, checkpoint62v, checkpoint62w, checkpoint62x
Changes since 1.21: +8 -4 lines
Diff to previous 1.21 
make changes for anelastic and deep-atmosphere when using r*
Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Sun Aug 24 21:38:18 2008 UTC (15 years, 9 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61c, checkpoint61d, checkpoint61e, checkpoint61f, checkpoint61g, checkpoint61h, checkpoint61i, checkpoint61j, checkpoint61k, checkpoint61l, checkpoint61m, checkpoint61n, checkpoint61o, checkpoint61p, checkpoint61q, checkpoint61r, checkpoint61s, checkpoint61t, checkpoint61u, checkpoint61v, checkpoint61w, checkpoint61x, checkpoint61y
Changes since 1.20: +23 -14 lines
Diff to previous 1.20 
add mass source/sink of fluid in continuity eq. ; need to store addMass
 in pickup file for restart.
Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Mon Oct 15 15:28:24 2007 UTC (16 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59i, checkpoint59j, checkpoint59k, checkpoint59l, checkpoint59m, checkpoint59n, checkpoint59o, checkpoint59p, checkpoint59q, checkpoint59r, checkpoint60, checkpoint61, checkpoint61a, checkpoint61b
Changes since 1.19: +4 -4 lines
Diff to previous 1.19 
finishing EmPmR unit changes: replace convertEmP2rUnit by mass2rUnit
Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Tue Sep 4 16:49:44 2007 UTC (16 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59g, checkpoint59h
Changes since 1.18: +5 -2 lines
Diff to previous 1.18 
reduce number of "warning: unused variable"
Revision 1.18 - (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, checkpoint58u_post, checkpoint58v_post, checkpoint58w_post, checkpoint58x_post, checkpoint58y_post, checkpoint59, checkpoint59a, checkpoint59b, checkpoint59c, checkpoint59d, checkpoint59e, checkpoint59f, mitgcm_mapl_00
Changes since 1.17: +12 -2 lines
Diff to previous 1.17 
start to implement deep-atmosphere and/or anelastic formulation
Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Sat Jul 22 03:53:13 2006 UTC (17 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58n_post, checkpoint58o_post, checkpoint58p_post, checkpoint58q_post, checkpoint58r_post
Changes since 1.16: +23 -17 lines
Diff to previous 1.16 
set PmEpR also in overlap (needed if useKPP with RealFreshWater & NonLin-FreeSurf)
Revision 1.16 - (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, checkpoint57z_post, checkpoint58, checkpoint58a_post, checkpoint58b_post, checkpoint58c_post, checkpoint58d_post, checkpoint58e_post, checkpoint58f_post, checkpoint58g_post, checkpoint58h_post, checkpoint58i_post, checkpoint58j_post, checkpoint58k_post, checkpoint58l_post, checkpoint58m_post
Changes since 1.15: +7 -4 lines
Diff to previous 1.15 
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.15 - (view) (download) (annotate) - [select for diffs]
Wed Dec 7 23:57:00 2005 UTC (18 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57y_pre
Changes since 1.14: +5 -9 lines
Diff to previous 1.14 
always reset wVel & eta (to zero or prescribe it) at the OBs.
Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Fri Nov 4 01:19:24 2005 UTC (18 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57x_post
Changes since 1.13: +2 -3 lines
Diff to previous 1.13 
remove unused variables (reduces number of compiler warning)
Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Mon Oct 17 15:29:54 2005 UTC (18 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57w_post
Changes since 1.12: +2 -2 lines
Diff to previous 1.12 
check time usig baseTime (was left from baseTime implementation)
Revision 1.12 - (view) (download) (annotate) - [select for diffs]
Wed Apr 6 18:29:53 2005 UTC (19 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpint57u_post, checkpoint57f_post, checkpoint57g_post, checkpoint57g_pre, checkpoint57h_done, checkpoint57h_post, checkpoint57h_pre, checkpoint57i_post, checkpoint57j_post, checkpoint57k_post, checkpoint57l_post, checkpoint57m_post, checkpoint57n_post, checkpoint57o_post, checkpoint57p_post, checkpoint57q_post, checkpoint57r_post, checkpoint57s_post, checkpoint57t_post, checkpoint57v_post
Changes since 1.11: +2 -2 lines
Diff to previous 1.11 
use baseTime as time origin ; DIFF_BASE_MULTIPLE replaces DIFFERENT_MULTIPLE
Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Thu Dec 30 19:27:55 2004 UTC (19 years, 5 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint57c_post, checkpoint57c_pre, checkpoint57d_post, checkpoint57e_post, checkpoint57f_pre, eckpoint57e_pre
Changes since 1.10: +3 -1 lines
Diff to previous 1.10 
added missing #ifdef ALLOW_OBCS
Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Thu Dec 30 18:30:54 2004 UTC (19 years, 5 months ago) by adcroft
Branch: MAIN
Changes since 1.9: +4 -1 lines
Diff to previous 1.9 
This fixes the problems with discontinuous SSH near open boundaries. It makes a difference for OBCs with a non-linear freesurface (and z*).
Revision 1.9 - (view) (download) (annotate) - [select for diffs]
Tue Oct 19 02:39:58 2004 UTC (19 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint55h_post, checkpoint55i_post, checkpoint55j_post, checkpoint56, checkpoint56a_post, checkpoint56b_post, checkpoint56c_post, checkpoint57, checkpoint57a_post, checkpoint57a_pre, checkpoint57b_post
Changes since 1.8: +2 -3 lines
Diff to previous 1.8 
use flags: fluidIsAir/Water, usingP/ZCoords instead of buoyancyRelation
Revision 1.8 - (view) (download) (annotate) - [select for diffs]
Sun Jul 18 22:00:09 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint54d_post, checkpoint54e_post, checkpoint54f_post, checkpoint55, checkpoint55a_post, checkpoint55b_post, checkpoint55c_post, checkpoint55d_post, checkpoint55d_pre, checkpoint55e_post, checkpoint55f_post, checkpoint55g_post
Changes since 1.7: +3 -3 lines
Diff to previous 1.7 
consistent with recent modifications of the code (post c54)
Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Tue Jul 6 01:05:53 2004 UTC (19 years, 10 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint54a_post, checkpoint54b_post, checkpoint54c_post
Changes since 1.6: +16 -11 lines
Diff to previous 1.6 
re-write staggerTimeStep: step forward momentum 1rst and then T,S
Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Tue Jun 29 22:21:43 2004 UTC (19 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint53g_post, checkpoint54, checkpoint54a_pre
Changes since 1.5: +51 -55 lines
Diff to previous 1.5 
store d.etaH/dt (instead of Div.hV) in common ; clean-up integr_continuity
Revision 1.5 - (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: branch-netcdf, checkpoint51i_post, checkpoint51k_post, checkpoint51l_post, checkpoint51l_pre, checkpoint51m_post, checkpoint51n_post, checkpoint51n_pre, checkpoint51o_post, checkpoint51o_pre, checkpoint51p_post, checkpoint51q_post, checkpoint51r_post, checkpoint51s_post, checkpoint51t_post, checkpoint51u_post, checkpoint52, checkpoint52a_post, checkpoint52a_pre, checkpoint52b_post, checkpoint52b_pre, checkpoint52c_post, checkpoint52d_post, checkpoint52d_pre, checkpoint52e_post, checkpoint52e_pre, checkpoint52f_post, checkpoint52f_pre, checkpoint52h_pre, checkpoint52i_post, checkpoint52i_pre, checkpoint52j_post, checkpoint52j_pre, checkpoint52k_post, checkpoint52l_post, checkpoint52l_pre, checkpoint52m_post, checkpoint52n_post, checkpoint53, checkpoint53a_post, checkpoint53b_post, checkpoint53b_pre, checkpoint53c_post, checkpoint53d_post, checkpoint53d_pre, checkpoint53f_post, ecco_c52_e35, hrcube4, hrcube5, hrcube_1, hrcube_2, hrcube_3
Branch point for: branch-nonh, checkpoint51n_branch, netcdf-sm0, tg2-branch
Changes since 1.4: +2 -1 lines
Diff to previous 1.4 
 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.4 - (view) (download) (annotate) - [select for diffs]
Mon Jan 27 20:45:59 2003 UTC (21 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: branchpoint-genmake2, checkpoint48b_post, checkpoint48d_post, checkpoint48d_pre, checkpoint48e_post, checkpoint48f_post, checkpoint48g_post, checkpoint48h_post, checkpoint48i_post, checkpoint49, checkpoint50, checkpoint50a_post, checkpoint50b_post, checkpoint50b_pre, checkpoint50c_post, checkpoint50c_pre, checkpoint50d_post, checkpoint50d_pre, checkpoint50e_post, checkpoint50e_pre, checkpoint50f_post, checkpoint50f_pre, checkpoint50g_post, checkpoint50h_post, checkpoint50i_post, checkpoint51, checkpoint51a_post, checkpoint51b_post, checkpoint51b_pre, checkpoint51c_post, checkpoint51d_post, checkpoint51e_post, checkpoint51f_post, checkpoint51f_pre, checkpoint51g_post, checkpoint51h_pre, checkpoint51i_pre, checkpoint51j_post
Branch point for: branch-genmake2, ecco-branch
Changes since 1.3: +4 -4 lines
Diff to previous 1.3 
improve checking compatible options with r*
Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Sun Jan 26 21:06:11 2003 UTC (21 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.2: +34 -2 lines
Diff to previous 1.2 
r* coordinate added in #ifdef NONLIN_FRSURF block.
 (modification to pressure gradient not yet implemented)
Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Tue Dec 10 03:00:59 2002 UTC (21 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: branch-exfmods-tag, checkpoint47c_post, checkpoint47d_post, checkpoint47d_pre, checkpoint47e_post, checkpoint47f_post, checkpoint47g_post, checkpoint47h_post, checkpoint47i_post, checkpoint47j_post, checkpoint48, checkpoint48a_post, checkpoint48c_post, checkpoint48c_pre
Branch point for: branch-exfmods-curt
Changes since 1.1: +31 -1 lines
Diff to previous 1.1 
 * OCEANICP & realFreshWater: include P-E direct effect on wVel ;
   NOTES: requires option NONLIN_FRSURF to be "#define".
Revision 1.1 - (view) (download) (annotate) - [select for diffs]
Mon Oct 7 16:17:09 2002 UTC (21 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint46j_post, checkpoint46k_post, checkpoint46l_post, checkpoint46l_pre, checkpoint46m_post, checkpoint46n_post, checkpoint47, checkpoint47a_post, checkpoint47b_post 
* 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

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