/[MITgcm]/MITgcm/pkg/seaice/seaice_model.F
ViewVC logotype

Log of /MITgcm/pkg/seaice/seaice_model.F

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


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

Revision 1.117 - (view) (download) (annotate) - [select for diffs]
Tue May 9 02:51:01 2017 UTC (7 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: HEAD, checkpoint66h, checkpoint66i, checkpoint66j, checkpoint66k, checkpoint66l, checkpoint66m, checkpoint66n, checkpoint66o
Changes since 1.116: +6 -6 lines
Diff to previous 1.116
comment out filling of diagnostics SIuwind,SIvwind,SIfu,SIfv


Revision 1.116 - (view) (download) (annotate) - [select for diffs]
Mon Apr 3 16:10:33 2017 UTC (7 years, 2 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint66f, checkpoint66g
Changes since 1.115: +2 -1 lines
Diff to previous 1.115
add a store for hsnow, necessary after adding flag to add snow mass to
seaiceMassC/U/V


Revision 1.115 - (view) (download) (annotate) - [select for diffs]
Fri Apr 22 08:52:15 2016 UTC (8 years, 1 month ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint65w, checkpoint65x, checkpoint65y, checkpoint65z, checkpoint66a, checkpoint66b, checkpoint66c, checkpoint66d, checkpoint66e
Changes since 1.114: +4 -1 lines
Diff to previous 1.114
make new code taf-able. There are still recomputations left that I
do not understand, so bottom drag code is not included by default


Revision 1.114 - (view) (download) (annotate) - [select for diffs]
Mon Oct 20 03:20:57 2014 UTC (9 years, 7 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint65g, checkpoint65h, checkpoint65i, checkpoint65j, checkpoint65k, checkpoint65l, checkpoint65m, checkpoint65n, checkpoint65o, checkpoint65p, checkpoint65q, checkpoint65r, checkpoint65s, checkpoint65t, checkpoint65u, checkpoint65v
Changes since 1.113: +4 -1 lines
Diff to previous 1.113
- ECCO_OPTIONS.h is needed when including ecco_cost.h, ecco.h
- AUTODIFF_OPTIONS.h is needed when including tamc.h, tamc_keys.h
- CTRL_OPTIONS.h is needed when including ctrl.h, etc

- pkg/seaice/seaice_cost*.F : clean up CPP brackets
- SEAICE_SIZE.h : replace ALLOW_AUTODIFF_TAMC with ALLOW_AUTODIFF to
  avoid needing AUTODIFF_OPTIONS.h anytime SEAICE_SIZE.h is included
  (it seems that THSICE_SIZE.h, PTRACERS_SIZE.h have the same issue...)


Revision 1.113 - (view) (download) (annotate) - [select for diffs]
Wed Apr 23 12:38:40 2014 UTC (10 years, 1 month ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint64w, checkpoint64x, checkpoint64y, checkpoint64z, checkpoint65, checkpoint65a, checkpoint65b, checkpoint65c, checkpoint65d, checkpoint65e, checkpoint65f
Changes since 1.112: +7 -1 lines
Diff to previous 1.112
  - move most of "PART 1" of S/R seaice_growth into a new and separate
    S/R seaice_reg_ridge that will both regularize the state variable after
    advection call the actual ridging routine;
  - requires to make 5 fields global fields: d_HEFFbyNEG,d_HSNWbyNEG,
    d_AREAbyRLX,d_HEFFbyRLX,saltFluxAdjust;
  - remove ridging code from seaice_advdiff
  - clean up remaining part 1 of seaice_growth in an attempt to make it
    more readable (this is probably subjective)
  - finally: add new ridging routine for ITD code


Revision 1.112 - (view) (download) (annotate) - [select for diffs]
Tue Nov 26 00:05:21 2013 UTC (10 years, 6 months ago) by torge
Branch: MAIN
CVS Tags: checkpoint64r, checkpoint64s, checkpoint64t, checkpoint64u, checkpoint64v
Changes since 1.111: +5 -4 lines
Diff to previous 1.111
- introduce tile exchange for HEFFITD, AREAITD, and HSNOWITD;
- move calls to DIAGNOSTICS_FILL for SIheffN and SIareaN
  from seaice_model.F to seaice_diagnostics_state.F


Revision 1.111 - (view) (download) (annotate) - [select for diffs]
Mon Nov 18 23:08:58 2013 UTC (10 years, 6 months ago) by jmc
Branch: MAIN
Changes since 1.110: +1 -3 lines
Diff to previous 1.110
avoid un-used variables


Revision 1.110 - (view) (download) (annotate) - [select for diffs]
Fri Nov 15 18:51:16 2013 UTC (10 years, 6 months ago) by torge
Branch: MAIN
CVS Tags: checkpoint64q
Changes since 1.109: +1 -42 lines
Diff to previous 1.109
moving calls to SEAICE_ITD_REDIST and SEAICE_ITD_SUM from
seaice_model to seaice_advdiff and seaice_growth because
HEFF needs to be updated within these two routines


Revision 1.109 - (view) (download) (annotate) - [select for diffs]
Fri Jun 7 13:08:11 2013 UTC (11 years ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint64i, checkpoint64j, checkpoint64k, checkpoint64l, checkpoint64m, checkpoint64n, checkpoint64o, checkpoint64p
Changes since 1.108: +2 -2 lines
Diff to previous 1.108
add uice/vice as uc/vc to the parameter list of s/r seaice_advdiff,
similar to thsice_advdiff.
Note that for the B-grid case the routine parameters uc/vc are overwritten.


Revision 1.108 - (view) (download) (annotate) - [select for diffs]
Sat May 25 16:19:56 2013 UTC (11 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint64h
Changes since 1.107: +3 -1 lines
Diff to previous 1.107
allows to compile without pkg/exf


Revision 1.107 - (view) (download) (annotate) - [select for diffs]
Sat May 4 17:32:28 2013 UTC (11 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.106: +4 -4 lines
Diff to previous 1.106
avoid unused variables


Revision 1.106 - (view) (download) (annotate) - [select for diffs]
Fri May 3 19:50:11 2013 UTC (11 years, 1 month ago) by torge
Branch: MAIN
Changes since 1.105: +1 -148 lines
Diff to previous 1.105
- removing all "ToM" comments
- removing all SEAICE_DEBUG lines, which were introduced with ITD development


Revision 1.105 - (view) (download) (annotate) - [select for diffs]
Mon Jan 21 23:02:56 2013 UTC (11 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint64d, checkpoint64e, checkpoint64f, checkpoint64g
Changes since 1.104: +9 -2 lines
Diff to previous 1.104
- implement new sequence of calls for thsice+seaice:
    previously:   ice-Dyn,ice-Advect,ice-Thermo(thsice)
    new sequence: ice-Thermo(thsice),ice-Dyn,ice-Advect
- allows (with temporary CPP option "#define OLD_THSICE_CALL_SEQUENCE"
  in CPP_OPTIONS.h) to recover old sequence


Revision 1.104 - (view) (download) (annotate) - [select for diffs]
Thu Dec 27 23:05:47 2012 UTC (11 years, 5 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint64c
Changes since 1.103: +2 -54 lines
Diff to previous 1.103
- remove legacy branch code.
- retire SEAICE_GROWTH_LEGACY and
  SEAICE_CAP_HEFF accordingly.


Revision 1.103 - (view) (download) (annotate) - [select for diffs]
Mon Dec 10 22:31:31 2012 UTC (11 years, 6 months ago) by torge
Branch: MAIN
CVS Tags: checkpoint64b
Changes since 1.102: +1 -19 lines
Diff to previous 1.102
remove variable "divergence" and associated code;
contained artificial divergence rate for test of ITD code in 1-D test case;
never meant to be permanently introduced


Revision 1.102 - (view) (download) (annotate) - [select for diffs]
Mon Oct 22 23:58:29 2012 UTC (11 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint64a
Changes since 1.101: +4 -3 lines
Diff to previous 1.101
remove tabs ; remove un-used variables.


Revision 1.101 - (view) (download) (annotate) - [select for diffs]
Mon Oct 22 21:14:07 2012 UTC (11 years, 7 months ago) by heimbach
Branch: MAIN
Changes since 1.100: +216 -2 lines
Diff to previous 1.100
Step 1 of merging ice-thickness distribution (ITD) code from
MITgcm_contrib/torge/itd/code/ to main repository
(author: Torge Martin)


Revision 1.100 - (view) (download) (annotate) - [select for diffs]
Fri Mar 2 18:56:06 2012 UTC (12 years, 3 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint63k, checkpoint63l, checkpoint63m, checkpoint63n, checkpoint63o, checkpoint63p, checkpoint63q, checkpoint63r, checkpoint63s, checkpoint64
Changes since 1.99: +15 -3 lines
Diff to previous 1.99
Prepare adjoint of SITRACER


Revision 1.99 - (view) (download) (annotate) - [select for diffs]
Thu Feb 16 01:22:02 2012 UTC (12 years, 3 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint63j
Changes since 1.98: +2 -2 lines
Diff to previous 1.98
- SItracer : added run time params, and allow coupling to ocn salinity.

new run time params in SEAICE_TRACER.h
--------------------------------------
        SItrNumInUse - Number of tracers that are in use (must be less that SItrMaxNum)
        SItrFromOcean0    - for new ice from ocean freeze - constant tracer value
        SItrFromOceanFrac - for new ice from ocean freeze - fraction of ocean tracer
        SItrFromFlood0    - for new ice from snow flood   - constant tracer value
        SItrFromFloodFrac - for new ice from snow flood   - fraction of ocean tracer
        SItrExpand0       - for ice cover thermo. exans.  - constant tracer value
new run time params in SEAICE_PARAMS.h
--------------------------------------
        SEAICE_salinityTracer    :: use SItracer to exchange and trace ocean salt in ice
        SEAICE_age Tracer        :: use SItracer to trace the age of ice

simple propagation of SItrNumInUse in
-------------------------------------
seaice_diagnostics_init.F seaice_diagnostics_state.F
seaice_model.F seaice_advdiff.F
seaice_monitor.F seaice_output.F


Revision 1.98 - (view) (download) (annotate) - [select for diffs]
Sat Feb 4 14:51:13 2012 UTC (12 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.97: +1 -8 lines
Diff to previous 1.97
isolate saltPlumeFlux array exch into a specific S/R called from do_oceanic_phys.F


Revision 1.97 - (view) (download) (annotate) - [select for diffs]
Fri Feb 3 13:34:31 2012 UTC (12 years, 4 months ago) by gforget
Branch: MAIN
Changes since 1.96: +2 -10 lines
Diff to previous 1.96
- removal of the old way of seaice age tracer, which is now replaced by particular cases of SITRACER.
- retired params : SEAICEadvAge, SEAICEadvSchAge, SEAICEdiffKhAge, IceAgeTrFile.
- added to SITRACER : IceAgeTrFile, check pickups, monitor, output.


Revision 1.96 - (view) (download) (annotate) - [select for diffs]
Sun Jan 15 02:12:14 2012 UTC (12 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63i
Changes since 1.95: +14 -3 lines
Diff to previous 1.95
forgot his case in previous changes: needs to fill areaNm1 & hEffNm1
 for S/R SEAICE_GROWTH (case SEAICE_GROWTH_LEGACY).


Revision 1.95 - (view) (download) (annotate) - [select for diffs]
Fri Jan 13 21:08:41 2012 UTC (12 years, 5 months ago) by jmc
Branch: MAIN
Changes since 1.94: +5 -3 lines
Diff to previous 1.94
- remove YNEG, RIVER, TMIX from common block;
- remove also areaNm1 & hEffNm1 when SEAICE_GROWTH_LEGACY is undef


Revision 1.94 - (view) (download) (annotate) - [select for diffs]
Wed Dec 28 20:55:06 2011 UTC (12 years, 5 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63h
Changes since 1.93: +13 -11 lines
Diff to previous 1.93
avoid unused variables


Revision 1.93 - (view) (download) (annotate) - [select for diffs]
Wed Dec 14 23:00:02 2011 UTC (12 years, 5 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint63g
Changes since 1.92: +3 -1 lines
Diff to previous 1.92
- remove this patholigical case treatment in evolution branch,
  where it is un-necessary and breaks conservation.


Revision 1.92 - (view) (download) (annotate) - [select for diffs]
Mon Oct 31 02:45:28 2011 UTC (12 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint63e, checkpoint63f
Changes since 1.91: +1 -13 lines
Diff to previous 1.91
Messing around with LSR adjoint


Revision 1.91 - (view) (download) (annotate) - [select for diffs]
Fri Oct 21 17:14:31 2011 UTC (12 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint63d
Changes since 1.90: +3 -3 lines
Diff to previous 1.90
rename former OBCS_APPLY_UVICE to OBCS_ADJUST_UVICE


Revision 1.90 - (view) (download) (annotate) - [select for diffs]
Fri Sep 23 02:55:27 2011 UTC (12 years, 8 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint63c
Changes since 1.89: +3 -1 lines
Diff to previous 1.89
Add flag DISABLE_SEAICE_GROWTH - just for An!


Revision 1.89 - (view) (download) (annotate) - [select for diffs]
Tue Jun 7 03:58:23 2011 UTC (13 years ago) by gforget
Branch: MAIN
CVS Tags: checkpoint62z, checkpoint63, checkpoint63a, checkpoint63b
Changes since 1.88: +13 -1 lines
Diff to previous 1.88
- introducing ALLOW_SITRACER and seaice_tracer_phys.F to handle generic seaice tracer.
  For now it covers, and was tested for, salinity and age (work in progress).
- introducing siEps (1e-5, parameter, defined in SEAICE_PARAMS.h).


Revision 1.88 - (view) (download) (annotate) - [select for diffs]
Wed May 25 21:04:47 2011 UTC (13 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62y
Changes since 1.87: +17 -26 lines
Diff to previous 1.87
comment out calls to S/R OBCS_COPY_TRACER (no longer needed with the
  the use of interior mask in advect & diffusion S/R)


Revision 1.87 - (view) (download) (annotate) - [select for diffs]
Thu Apr 28 02:06:31 2011 UTC (13 years, 1 month ago) by ifenty
Branch: MAIN
CVS Tags: checkpoint62x
Changes since 1.86: +5 -5 lines
Diff to previous 1.86
Renaming of compile time flag SEAICE_SALINITY to SEAICE_VARIABLE_SALINITY and
SEAICE_salinity to SIsalFRAC.

Added logical checks for the use of the retired variable names in
 seaice_readparms and seaice_check.

 ----------------------------------------------------------------------
 Modified Files:
 	pkg/autodiff/autodiff_restore.F pkg/autodiff/autodiff_store.F
 	pkg/obcs/obcs_apply_seaice.F pkg/seaice/SEAICE.h
 	pkg/seaice/SEAICE_OPTIONS.h pkg/seaice/SEAICE_PARAMS.h
 	pkg/seaice/seaice_ad_check_lev1_dir.h
 	pkg/seaice/seaice_advdiff.F pkg/seaice/seaice_check.F
 	pkg/seaice/seaice_diagnostics_state.F
 	pkg/seaice/seaice_growth.F pkg/seaice/seaice_init_varia.F
 	pkg/seaice/seaice_model.F pkg/seaice/seaice_monitor.F
 	pkg/seaice/seaice_output.F pkg/seaice/seaice_read_pickup.F
 	pkg/seaice/seaice_readparms.F pkg/seaice/seaice_write_pickup.F
 ----------------------------------------------------------------------


Revision 1.86 - (view) (download) (annotate) - [select for diffs]
Wed Apr 20 01:34:27 2011 UTC (13 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62w
Changes since 1.85: +5 -4 lines
Diff to previous 1.85
avoid un-used variables (placed within proper #ifdef)


Revision 1.85 - (view) (download) (annotate) - [select for diffs]
Sat Mar 5 18:06:06 2011 UTC (13 years, 3 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint62u, checkpoint62v
Changes since 1.84: +16 -6 lines
Diff to previous 1.84
Start a seaice tracer-like code but for now confinded to ice age


Revision 1.84 - (view) (download) (annotate) - [select for diffs]
Sun Feb 6 21:37:45 2011 UTC (13 years, 4 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62s, checkpoint62t
Changes since 1.83: +1 -5 lines
Diff to previous 1.83
remove SEAICE_ALLOW_TD_IF pieces of code


Revision 1.83 - (view) (download) (annotate) - [select for diffs]
Thu Nov 18 17:32:37 2010 UTC (13 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62o, checkpoint62p, checkpoint62q, checkpoint62r
Changes since 1.82: +6 -11 lines
Diff to previous 1.82
switch some test on debugLevel value to debugMode test


Revision 1.82 - (view) (download) (annotate) - [select for diffs]
Mon Nov 8 17:38:04 2010 UTC (13 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint62n
Changes since 1.81: +25 -2 lines
Diff to previous 1.81
call OBCS_COPY_TRACER for advected seaice variable (AREA, HEFF, HSNOW,
 HSALT and ICEAGE) (should fix Pb when using high-order scheme with OB
 near tile edge)


Revision 1.81 - (view) (download) (annotate) - [select for diffs]
Sun Oct 31 20:07:01 2010 UTC (13 years, 7 months ago) by gforget
Branch: MAIN
Changes since 1.80: +3 -1 lines
Diff to previous 1.80
- move areaMin, hiceMin, areaMax to common blocks.
- sort out diagnostics in seaice_growth.F.
- practical approximations in seaice_growth.F adjoint.
- reset TICE to celsius2K when no ice is present.


Revision 1.80 - (view) (download) (annotate) - [select for diffs]
Fri Mar 12 23:10:29 2010 UTC (14 years, 3 months ago) by gforget
Branch: MAIN
CVS Tags: checkpoint62d, checkpoint62e, checkpoint62f, checkpoint62g, checkpoint62h, checkpoint62i, checkpoint62j, checkpoint62k, checkpoint62l, checkpoint62m
Changes since 1.79: +31 -1 lines
Diff to previous 1.79
fix seaice model adjoint -- to be followed by
updates in ajoint model test results by jmc


Revision 1.79 - (view) (download) (annotate) - [select for diffs]
Fri Nov 27 15:00:56 2009 UTC (14 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint61z, checkpoint62, checkpoint62a, checkpoint62b, checkpoint62c
Changes since 1.78: +6 -1 lines
Diff to previous 1.78
Update store directives for EVP


Revision 1.78 - (view) (download) (annotate) - [select for diffs]
Thu Sep 3 20:48:40 2009 UTC (14 years, 9 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61v, checkpoint61w, checkpoint61x, checkpoint61y
Changes since 1.77: +8 -8 lines
Diff to previous 1.77
uses the right type of S/R for diagnostic filling


Revision 1.77 - (view) (download) (annotate) - [select for diffs]
Thu Jun 25 15:52:06 2009 UTC (14 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61r, checkpoint61s, checkpoint61t, checkpoint61u
Changes since 1.76: +1 -2 lines
Diff to previous 1.76
remove un-used variable


Revision 1.76 - (view) (download) (annotate) - [select for diffs]
Thu Jun 25 14:36:15 2009 UTC (14 years, 11 months ago) by heimbach
Branch: MAIN
Changes since 1.75: +2 -5 lines
Diff to previous 1.75
Changed initialisation and re-initialisations of seaiceMaskU/V


Revision 1.75 - (view) (download) (annotate) - [select for diffs]
Wed Jun 24 22:42:04 2009 UTC (14 years, 11 months ago) by jmc
Branch: MAIN
Changes since 1.74: +3 -1 lines
Diff to previous 1.74
add "#ifdef SEAICE_CGRID / #endif" arround seaiceMaskU,V ;
 (this fixes offline_exf_seaice AD)


Revision 1.74 - (view) (download) (annotate) - [select for diffs]
Wed Jun 24 20:10:17 2009 UTC (14 years, 11 months ago) by heimbach
Branch: MAIN
Changes since 1.73: +18 -2 lines
Diff to previous 1.73
o initializations of *nm1 to break dependencies
o adjust some store directives


Revision 1.73 - (view) (download) (annotate) - [select for diffs]
Wed Jun 24 08:01:43 2009 UTC (14 years, 11 months ago) by mlosch
Branch: MAIN
Changes since 1.72: +6 -6 lines
Diff to previous 1.72
 third and step of replacing 3D versions of UICE,VICE,HEFF,AREA by 2D
 versions. Keep your fingers crossed.


Revision 1.72 - (view) (download) (annotate) - [select for diffs]
Sun Jun 21 23:08:48 2009 UTC (14 years, 11 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint61q
Changes since 1.71: +1 -3 lines
Diff to previous 1.71
o adding JM's doc/diags_changes.txt:
  a very useful summary that I refer to all the time
o adding pkg/seaice diagnostics for atmospheric and oceanic
   heat flux and for atmospheric and oceanic ice growth


Revision 1.71 - (view) (download) (annotate) - [select for diffs]
Thu Jun 11 20:31:13 2009 UTC (15 years ago) by jmc
Branch: MAIN
Changes since 1.70: +2 -1 lines
Diff to previous 1.70
move diagnostic of Atmospheric Fresh-Water flux with other forcing diag
 (since it is not a state variable)


Revision 1.70 - (view) (download) (annotate) - [select for diffs]
Tue Jun 2 16:11:32 2009 UTC (15 years ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint61p
Changes since 1.69: +3 -3 lines
Diff to previous 1.69
Adding stressDivergenceX/Y to store.


Revision 1.69 - (view) (download) (annotate) - [select for diffs]
Tue May 19 21:50:25 2009 UTC (15 years ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61o
Changes since 1.68: +9 -9 lines
Diff to previous 1.68
comment out un-used variables


Revision 1.68 - (view) (download) (annotate) - [select for diffs]
Tue Apr 28 18:46:46 2009 UTC (15 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint61m, checkpoint61n
Changes since 1.67: +9 -9 lines
Diff to previous 1.67
fix wrong type of EXCH for "saltPlumeFlux"
+ change macros (EXCH & GLOBAL_SUM/MAX) sufix _R4/_R8 to _RS/_RL
  when applied to _RS/_RL variable


Revision 1.67 - (view) (download) (annotate) - [select for diffs]
Fri Feb 13 21:59:17 2009 UTC (15 years, 3 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint61j, checkpoint61k, checkpoint61l
Changes since 1.66: +29 -29 lines
Diff to previous 1.66
Update tamc.h for single-prec comlev option


Revision 1.66 - (view) (download) (annotate) - [select for diffs]
Wed Dec 17 03:33:30 2008 UTC (15 years, 5 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint61g, checkpoint61h, checkpoint61i
Changes since 1.65: +5 -2 lines
Diff to previous 1.65
added sea ice age tracer;  #define SEAICE_AGE in SEAICE_PARAMS.h


Revision 1.65 - (view) (download) (annotate) - [select for diffs]
Thu Mar 27 19:53:14 2008 UTC (16 years, 2 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint59p, checkpoint59q, checkpoint59r, checkpoint60, checkpoint61, checkpoint61a, checkpoint61b, checkpoint61c, checkpoint61d, checkpoint61e, checkpoint61f
Changes since 1.64: +5 -1 lines
Diff to previous 1.64
Add Ian Fenty sea-ice thermodynamics modifications.
Currently this is in separate routines to enable alternative testing.
(relevant routines are ..._if.F)
CPP switch is via
#define SEAICE_ALLOW_TD_IF
I.F. code doesnt contain latest SEAICE_SALINITY code


Revision 1.64 - (view) (download) (annotate) - [select for diffs]
Mon Jan 21 17:39:11 2008 UTC (16 years, 4 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint59n, checkpoint59o
Changes since 1.63: +17 -2 lines
Diff to previous 1.63
o Update stores after recent IF (DIFFERENT_MULTIPLE ...
o re-initialise to break some dependencies (not sure if all correct)
o turn some scalares into tw-dim.


Revision 1.63 - (view) (download) (annotate) - [select for diffs]
Fri Jan 18 01:38:34 2008 UTC (16 years, 4 months ago) by dimitri
Branch: MAIN
Changes since 1.62: +9 -70 lines
Diff to previous 1.62
o pkg/obcs: replace obcs_apply_area/heff/hsalt/hsnow with obcs_apply_seaice


Revision 1.62 - (view) (download) (annotate) - [select for diffs]
Thu Jan 17 22:33:08 2008 UTC (16 years, 4 months ago) by dimitri
Branch: MAIN
Changes since 1.61: +9 -15 lines
Diff to previous 1.61
o pkg/seaice: moved DIFFERENT_MULTIPLE from seaice_model to seaice_dynsolver
  http://forge.csail.mit.edu/pipermail/mitgcm-devel/2008-January/003173.html


Revision 1.61 - (view) (download) (annotate) - [select for diffs]
Fri Dec 21 01:32:35 2007 UTC (16 years, 5 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59m
Changes since 1.60: +71 -6 lines
Diff to previous 1.60
Moved seaice tracer obcs after call to seaice_growth.


Revision 1.60 - (view) (download) (annotate) - [select for diffs]
Wed Dec 5 15:37:13 2007 UTC (16 years, 6 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59l
Changes since 1.59: +2 -22 lines
Diff to previous 1.59
pkg/seaice: removed some unused halos


Revision 1.59 - (view) (download) (annotate) - [select for diffs]
Wed Dec 5 07:28:29 2007 UTC (16 years, 6 months ago) by dimitri
Branch: MAIN
Changes since 1.58: +6 -12 lines
Diff to previous 1.58
o pkg/seaice: removed SEAICE_FFIELDS.h and seaice_get_forcing.F
  seaice forcing fields can now be read only through pkg/exf


Revision 1.58 - (view) (download) (annotate) - [select for diffs]
Wed Nov 28 09:26:16 2007 UTC (16 years, 6 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59k
Changes since 1.57: +2 -2 lines
Diff to previous 1.57
added check, readparms, and more diagnostice to pkg/salt_plume
also changed package flag from useSaltPlume to useSALT_PLUME


Revision 1.57 - (view) (download) (annotate) - [select for diffs]
Wed Nov 28 00:18:18 2007 UTC (16 years, 6 months ago) by dimitri
Branch: MAIN
Changes since 1.56: +9 -5 lines
Diff to previous 1.56
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


Revision 1.56 - (view) (download) (annotate) - [select for diffs]
Fri Oct 26 19:16:46 2007 UTC (16 years, 7 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59j
Changes since 1.55: +2 -2 lines
Diff to previous 1.55
one more bug fix: wrong routine arguments


Revision 1.55 - (view) (download) (annotate) - [select for diffs]
Fri Oct 26 18:27:25 2007 UTC (16 years, 7 months ago) by dimitri
Branch: MAIN
Changes since 1.54: +2 -2 lines
Diff to previous 1.54
bug fixes - thx Manfredi


Revision 1.54 - (view) (download) (annotate) - [select for diffs]
Fri Oct 26 02:00:48 2007 UTC (16 years, 7 months ago) by dimitri
Branch: MAIN
Changes since 1.53: +10 -1 lines
Diff to previous 1.53
Added open boundary conditions capability for seaice UICE, and VICE
UICE and VICE are reset at the edges after calling the solver and
before advection/diffusion.  Needs testing.


Revision 1.53 - (view) (download) (annotate) - [select for diffs]
Sat Sep 22 03:11:03 2007 UTC (16 years, 8 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59h, checkpoint59i
Changes since 1.52: +4 -1 lines
Diff to previous 1.52
Committing An Nguyen's modifications to SALT_PLUME code.  This includes
addition of a saltPlumeFlux array to FFIELDS and of routine plumefrac.F


Revision 1.52 - (view) (download) (annotate) - [select for diffs]
Sat Sep 15 01:38:59 2007 UTC (16 years, 9 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59g
Changes since 1.51: +7 -3 lines
Diff to previous 1.51
adding ice salinity HSALT as a prognostic variable


Revision 1.51 - (view) (download) (annotate) - [select for diffs]
Fri Jun 22 06:41:10 2007 UTC (16 years, 11 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint59e, checkpoint59f
Changes since 1.50: +2 -1 lines
Diff to previous 1.50
o pkg/seaice: added computation of saltFlux in seaice_growth;
   For time being, sea ice salinity is assumed constant
   contribution of snow flooding to freshening of sea ice is neglected.
   SEAICE_salinity is set in SEAICE_PARM01 of data.seaice and it
   defaults to 0.0 in order to maintain backward compatibility.
   Typical values for SEAICE_salinity are 4 to 10 g/kg.


Revision 1.50 - (view) (download) (annotate) - [select for diffs]
Fri Jun 8 16:07:37 2007 UTC (17 years ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint59d
Changes since 1.49: +3 -1 lines
Diff to previous 1.49
Another flag was needed.


Revision 1.49 - (view) (download) (annotate) - [select for diffs]
Fri Jun 8 13:37:59 2007 UTC (17 years ago) by heimbach
Branch: MAIN
Changes since 1.48: +13 -8 lines
Diff to previous 1.48
Bracket diagnostics calls according to package.


Revision 1.48 - (view) (download) (annotate) - [select for diffs]
Fri Jun 8 08:04:22 2007 UTC (17 years ago) by mlosch
Branch: MAIN
Changes since 1.47: +11 -1 lines
Diff to previous 1.47
move diagnosing "non state variable" from seaice_diagnostics_fill to
seaice_model


Revision 1.47 - (view) (download) (annotate) - [select for diffs]
Fri Jun 1 22:20:02 2007 UTC (17 years ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint59c
Changes since 1.46: +10 -3 lines
Diff to previous 1.46
Seaice_model suddenly needs much more storing.
Don't have time to check what has changed (again).


Revision 1.46 - (view) (download) (annotate) - [select for diffs]
Fri May 18 02:46:42 2007 UTC (17 years ago) by jmc
Branch: MAIN
Changes since 1.45: +12 -8 lines
Diff to previous 1.45
remove ALLOW_SEAICE from exf pkg files and add #define ALLOW_RUNOFF
in SEAICE_OPTIONS.h


Revision 1.45 - (view) (download) (annotate) - [select for diffs]
Mon May 14 14:12:46 2007 UTC (17 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59b
Changes since 1.44: +10 -10 lines
Diff to previous 1.44
- fix CPP comments (was giving warnings).
- fix EXCH of uwind,vwind for CS-grid : it does change the results of
  my cs32-grid test, but might have even larger impact on Lat-Lon-Cap grid.


Revision 1.44 - (view) (download) (annotate) - [select for diffs]
Tue May 1 13:42:15 2007 UTC (17 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpoint59a
Changes since 1.43: +1 -4 lines
Diff to previous 1.43
fix previous modifs so that it compiles.


Revision 1.43 - (view) (download) (annotate) - [select for diffs]
Mon Apr 30 22:48:52 2007 UTC (17 years, 1 month ago) by mlosch
Branch: MAIN
Changes since 1.42: +37 -30 lines
Diff to previous 1.42
some parameter clarifications and a little bit of spring cleaning


Revision 1.42 - (view) (download) (annotate) - [select for diffs]
Mon Apr 30 00:15:10 2007 UTC (17 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.41: +11 -3 lines
Diff to previous 1.41
add all needed EXF #ifdef and define them in SEAICE_OPTIONS.h if not using EXF


Revision 1.41 - (view) (download) (annotate) - [select for diffs]
Sun Apr 29 22:27:39 2007 UTC (17 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.40: +7 -1 lines
Diff to previous 1.40
remove code which deals with advection of pkg/thsice variables


Revision 1.40 - (view) (download) (annotate) - [select for diffs]
Mon Apr 16 22:30:05 2007 UTC (17 years, 1 month ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint59
Changes since 1.39: +3 -4 lines
Diff to previous 1.39
-remove seaice_exch and seaice_exch_uv
-remove superfluous exchange of theta


Revision 1.39 - (view) (download) (annotate) - [select for diffs]
Sun Apr 1 18:59:58 2007 UTC (17 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58x_post, checkpoint58y_post
Changes since 1.38: +25 -3 lines
Diff to previous 1.38
add debug calls.


Revision 1.38 - (view) (download) (annotate) - [select for diffs]
Thu Dec 14 22:31:18 2006 UTC (17 years, 6 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58t_post, checkpoint58u_post, checkpoint58v_post, checkpoint58w_post
Changes since 1.37: +9 -3 lines
Diff to previous 1.37
Updating seaice adjoint, step 1 (everything, except SEAICE_EVP).


Revision 1.37 - (view) (download) (annotate) - [select for diffs]
Thu Dec 14 08:36:20 2006 UTC (17 years, 6 months ago) by mlosch
Branch: MAIN
Changes since 1.36: +2 -2 lines
Diff to previous 1.36
 overhaul of thermodynamics
- growth.F and groatb.F are replaced by new routine seaice_growth.F
- budget.F is replaced by two new routines seaice_budget_ocean/ice.F
- move a few global fields out of SEAICE.h into seaice_growth.F and
  make them 2D (FICE/QNETO/ ...)
- remove FO (it is the same as QNETO)
- introduce a few local fields to avoid modifying external fields such
  as atemp, etc.

  lab_sea does not change, but hopefully it will be easier for Patrick
  do the adjoint


Revision 1.36 - (view) (download) (annotate) - [select for diffs]
Wed Nov 1 09:49:37 2006 UTC (17 years, 7 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58r_post, checkpoint58s_post
Changes since 1.35: +2 -1 lines
Diff to previous 1.35
o add flooding algorithm and advection of HSNOW; both are turned off
  by default and do not fix any of the observed problems.


Revision 1.35 - (view) (download) (annotate) - [select for diffs]
Thu Oct 5 18:41:32 2006 UTC (17 years, 8 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint58q_post
Changes since 1.34: +5 -1 lines
Diff to previous 1.34
implement sea-ice loading (when using "RealFreshWaterFlux")


Revision 1.34 - (view) (download) (annotate) - [select for diffs]
Mon Jun 5 22:46:49 2006 UTC (18 years ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58g_post, checkpoint58h_post, checkpoint58i_post, checkpoint58j_post, checkpoint58k_post, checkpoint58l_post, checkpoint58m_post, checkpoint58n_post, checkpoint58o_post, checkpoint58p_post
Changes since 1.33: +19 -19 lines
Diff to previous 1.33
o modifications and additions necessary for coupling thsice to seaice
  - major change in seaice_advdiff to make advection and diffusion
    more transparent
  - two new routines for mapping and computing advection and
    diffusion, makes seaice_diffusion obsolete


Revision 1.33 - (view) (download) (annotate) - [select for diffs]
Sat May 6 19:34:39 2006 UTC (18 years, 1 month ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint58e_post, checkpoint58f_post
Changes since 1.32: +3 -12 lines
Diff to previous 1.32
One more STORE change.


Revision 1.32 - (view) (download) (annotate) - [select for diffs]
Sat May 6 19:13:51 2006 UTC (18 years, 1 month ago) by heimbach
Branch: MAIN
Changes since 1.31: +18 -7 lines
Diff to previous 1.31
Avoid recomputation call to seaice_advdiff to
circumvene TAF bug (1.8.42)


Revision 1.31 - (view) (download) (annotate) - [select for diffs]
Thu Apr 27 12:41:51 2006 UTC (18 years, 1 month ago) by heimbach
Branch: MAIN
Changes since 1.30: +5 -1 lines
Diff to previous 1.30
First stab at SEAICE_CGRID.


Revision 1.30 - (view) (download) (annotate) - [select for diffs]
Mon Mar 6 13:17:37 2006 UTC (18 years, 3 months ago) by mlosch
Branch: MAIN
CVS Tags: checkpoint58b_post, checkpoint58c_post, checkpoint58d_post
Changes since 1.29: +7 -1 lines
Diff to previous 1.29
 - add c-grid version of the dynamic solver:
   + three new routines that are the c-grid substitute lsr, dynsolver
     and ostres
   + put a few fields that were local to dynsolver into global common
     blocks, so that I can move the computation of stresses etc into
     seaice_lsr (saves coding but may break the adjoint; Patrick, I am
     sorry!).
 - replace more hardwired parameters by runtime parameters
 - add ice masks that mask the rhs of the implicit solvers where there
   is no ice (commented out in seaice_dynsolver, because i am not sure
   if this works properly), eventually this should replace the clipping
   of ice velocities in seaice_dynsolver to +/-40cm/s.


Revision 1.29 - (view) (download) (annotate) - [select for diffs]
Fri Mar 3 07:52:01 2006 UTC (18 years, 3 months ago) by mlosch
Branch: MAIN
Changes since 1.28: +1 -22 lines
Diff to previous 1.28
- correct units of turning angles (now they are really in degrees)
- move computation of GWATX/Y out of main routine into dynsolver
- initialize GWATX/Y in seaice_init


Revision 1.28 - (view) (download) (annotate) - [select for diffs]
Thu Feb 16 10:41:48 2006 UTC (18 years, 3 months ago) by mlosch
Branch: MAIN
Changes since 1.27: +4 -5 lines
Diff to previous 1.27
 add a few new advection schemes to seaice:
 ENUM_UPWIND_1RST, ENUM_DST2, ENUM_FLUX_LIMIT, ENUM_DST3,
 ENUM_DST3_FLUX_LIMIT
 Default is still the old one


Revision 1.27 - (view) (download) (annotate) - [select for diffs]
Sun May 15 03:04:57 2005 UTC (19 years, 1 month ago) by jmc
Branch: MAIN
CVS Tags: checkpint57u_post, checkpoint57h_done, 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, checkpoint57w_post, checkpoint57x_post, checkpoint57y_post, checkpoint57y_pre, checkpoint57z_post, checkpoint58, checkpoint58a_post
Changes since 1.26: +6 -5 lines
Diff to previous 1.26
remove "baseTime" (no used) from arg. list of DIFF_BASE_MULTIPLE
and rename it: DIFFERENT_MULTIPLE


Revision 1.26 - (view) (download) (annotate) - [select for diffs]
Wed Apr 6 18:46:34 2005 UTC (19 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint57f_post, checkpoint57g_post, checkpoint57g_pre, checkpoint57h_post, checkpoint57h_pre
Changes since 1.25: +5 -5 lines
Diff to previous 1.25
use baseTime as time origin ; DIFF_BASE_MULTIPLE replaces DIFFERENT_MULTIPLE


Revision 1.25 - (view) (download) (annotate) - [select for diffs]
Mon Dec 27 20:34:11 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.24: +1 -5 lines
Diff to previous 1.24
o added seaice_summary.F and removed obsolete ALLOW_SEAICE's from pkg/seaice


Revision 1.24 - (view) (download) (annotate) - [select for diffs]
Mon Jul 5 20:05:07 2004 UTC (19 years, 11 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint54a_post, checkpoint54a_pre, checkpoint54b_post, checkpoint54c_post, checkpoint54d_post, checkpoint54e_post, checkpoint54f_post, checkpoint55, checkpoint55a_post, checkpoint55b_post, checkpoint55c_post, checkpoint55d_post, checkpoint55d_pre, checkpoint55e_post, checkpoint55f_post, checkpoint55g_post, checkpoint55h_post, checkpoint55i_post, checkpoint55j_post, checkpoint56, checkpoint56a_post, checkpoint56b_post, checkpoint56c_post, checkpoint57, checkpoint57a_post, checkpoint57a_pre, checkpoint57b_post
Changes since 1.23: +1 -2 lines
Diff to previous 1.23
o require forcing_In_AB=.FALSE. and remove surfaceTendencyTice from pkg/seaice
  - modified verification/lab_sea and natl_box_adjoint accordingly


Revision 1.23 - (view) (download) (annotate) - [select for diffs]
Wed May 5 07:15:41 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint52n_post, checkpoint53, checkpoint53a_post, checkpoint53b_post, checkpoint53b_pre, checkpoint53c_post, checkpoint53d_post, checkpoint53d_pre, checkpoint53f_post, checkpoint53g_post, checkpoint54
Changes since 1.22: +12 -2 lines
Diff to previous 1.22
Fooling around with ApiReference for pkg/kpp, pkg/sbo, and pkg/seaice


Revision 1.22 - (view) (download) (annotate) - [select for diffs]
Wed May 5 02:50:36 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.21: +1 -2 lines
Diff to previous 1.21
removed a debug print statement


Revision 1.21 - (view) (download) (annotate) - [select for diffs]
Wed May 5 00:23:37 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.20: +10 -3 lines
Diff to previous 1.20
  - added SEAICE_deltaTtherm and SEAICE_deltaTdyn in order to reduce cost
    of pkg/seaice.  For time being, SEAICE_deltaTtherm = deltaTtracer
    and SEAICE_deltaTdyn must be integer multiple of SEAICE_deltaTtherm


Revision 1.20 - (view) (download) (annotate) - [select for diffs]
Mon May 3 22:13:32 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.19: +2 -2 lines
Diff to previous 1.19
  - changed proxy for geostrophic velocity and updated
    verification/lab_sea/results/* accordingly


Revision 1.19 - (view) (download) (annotate) - [select for diffs]
Mon May 3 21:13:07 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.18: +6 -11 lines
Diff to previous 1.18
  - changed proxy for geostrophic velocity and updated
    verification/lab_sea/results/* accordingly


Revision 1.18 - (view) (download) (annotate) - [select for diffs]
Mon May 3 16:30:20 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.17: +2 -2 lines
Diff to previous 1.17
50 -> 50.0 for compiler compatibility


Revision 1.17 - (view) (download) (annotate) - [select for diffs]
Mon May 3 06:58:39 2004 UTC (20 years, 1 month ago) by dimitri
Branch: MAIN
Changes since 1.16: +13 -8 lines
Diff to previous 1.16
  - changed proxy for geostrophic velocity and updated
    verification/lab_sea/results/output.txt accordingly


Revision 1.16 - (view) (download) (annotate) - [select for diffs]
Tue Mar 2 08:45:46 2004 UTC (20 years, 3 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint52l_post, checkpoint52l_pre, checkpoint52m_post, hrcube5
Changes since 1.15: +2 -2 lines
Diff to previous 1.15
o moved SEAICE_DO_DIAGS to S/R do_the_model_io
o bug fix for pkg/seaice pickups


Revision 1.15 - (view) (download) (annotate) - [select for diffs]
Mon Dec 15 18:39:16 2003 UTC (20 years, 6 months ago) by jmc
Branch: MAIN
CVS Tags: checkpoint52d_post, checkpoint52e_post, checkpoint52e_pre, checkpoint52f_post, checkpoint52f_pre, checkpoint52h_pre, checkpoint52i_post, checkpoint52i_pre, checkpoint52j_post, checkpoint52j_pre, checkpoint52k_post, hrcube4, hrcube_1, hrcube_2, hrcube_3
Changes since 1.14: +2 -3 lines
Diff to previous 1.14
move "call seaice_write_pickup" to packages_write_pickup with other pkgs


Revision 1.14 - (view) (download) (annotate) - [select for diffs]
Sun Dec 14 04:56:18 2003 UTC (20 years, 6 months ago) by dimitri
Branch: MAIN
Changes since 1.13: +18 -20 lines
Diff to previous 1.13
added "exch_uv" exchanges to pkg/seaice


Revision 1.13 - (view) (download) (annotate) - [select for diffs]
Thu Nov 13 06:35:15 2003 UTC (20 years, 7 months ago) by dimitri
Branch: MAIN
CVS Tags: branch-netcdf, checkpoint52a_post, checkpoint52b_post, checkpoint52b_pre, checkpoint52c_post, checkpoint52d_pre
Branch point for: netcdf-sm0
Changes since 1.12: +1 -2 lines
Diff to previous 1.12
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.12 - (view) (download) (annotate) - [select for diffs]
Thu Nov 6 22:13:00 2003 UTC (20 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint51u_post, checkpoint52, checkpoint52a_pre, ecco_c52_e35
Changes since 1.11: +2 -2 lines
Diff to previous 1.11
o merging from ecco-branch
o updated/extended some store directives for seaice


Revision 1.11 - (view) (download) (annotate) - [select for diffs]
Fri Oct 24 05:29:36 2003 UTC (20 years, 7 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51o_post, checkpoint51o_pre, checkpoint51p_post, checkpoint51q_post, checkpoint51r_post, checkpoint51s_post, checkpoint51t_post
Branch point for: branch-nonh
Changes since 1.10: +2 -1 lines
Diff to previous 1.10
 o undid all of the cp51 checkin pending some ongoing code cleanups
   and discussion


Revision 1.10 - (view) (download) (annotate) - [select for diffs]
Thu Oct 23 07:14:49 2003 UTC (20 years, 7 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint51n_post
Branch point for: checkpoint51n_branch
Changes since 1.9: +1 -2 lines
Diff to previous 1.9
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.9 - (view) (download) (annotate) - [select for diffs]
Thu Oct 9 04:19:20 2003 UTC (20 years, 8 months ago) by edhill
Branch: MAIN
CVS Tags: checkpoint51i_post, checkpoint51k_post, checkpoint51l_post, checkpoint51l_pre, checkpoint51m_post, checkpoint51n_pre
Branch point for: tg2-branch
Changes since 1.8: +2 -1 lines
Diff to previous 1.8
 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.8 - (view) (download) (annotate) - [select for diffs]
Tue Jun 24 16:09:37 2003 UTC (20 years, 11 months ago) by heimbach
Branch: MAIN
CVS Tags: branchpoint-genmake2, 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
Changes since 1.7: +21 -4 lines
Diff to previous 1.7
Merging for c51 vs. e34


Revision 1.7 - (view) (download) (annotate) - [select for diffs]
Fri May 23 20:19:16 2003 UTC (21 years ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint50g_post, checkpoint50h_post, checkpoint50i_post
Changes since 1.6: +13 -11 lines
Diff to previous 1.6
checkpoint50g_post
o merged with release1_p17 (pkg/seaice and verification/lab_sea)
  - added SEAICE_MULTILEVEL for 8-category sea-ice thermodynamics
  - LSR sea-ice dynamic solver moved to SouthWest B-grid location and
    made the default because of faster convergence than ADI


Revision 1.6 - (view) (download) (annotate) - [select for diffs]
Wed Apr 30 07:04:08 2003 UTC (21 years, 1 month ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint50c_post, checkpoint50c_pre, checkpoint50d_post, checkpoint50d_pre, checkpoint50e_post, checkpoint50e_pre, checkpoint50f_post, checkpoint50f_pre
Changes since 1.5: +11 -5 lines
Diff to previous 1.5
checkpoint50c_pre
Merging from release1_p13:
o bug fix for pkg/seaice dynamic solver
o Added SEAICE_initialHEFF to pkg/seaice


Revision 1.5 - (view) (download) (annotate) - [select for diffs]
Tue Feb 18 05:33:55 2003 UTC (21 years, 3 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint48f_post, checkpoint48g_post, checkpoint48h_post, checkpoint48i_post, checkpoint49, checkpoint50, checkpoint50a_post, checkpoint50b_post, checkpoint50b_pre
Changes since 1.4: +12 -16 lines
Diff to previous 1.4
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


Revision 1.4 - (view) (download) (annotate) - [select for diffs]
Sat Dec 28 10:11:11 2002 UTC (21 years, 5 months ago) by dimitri
Branch: MAIN
CVS Tags: checkpoint47f_post, checkpoint47g_post, checkpoint47h_post, checkpoint47i_post, checkpoint47j_post, checkpoint48, checkpoint48a_post, checkpoint48b_post, checkpoint48c_post, checkpoint48c_pre, checkpoint48d_post, checkpoint48d_pre, checkpoint48e_post
Branch point for: c24_e25_ice, ecco-branch
Changes since 1.3: +24 -4 lines
Diff to previous 1.3
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


Revision 1.3 - (view) (download) (annotate) - [select for diffs]
Thu Dec 5 08:43:03 2002 UTC (21 years, 6 months ago) by dimitri
Branch: MAIN
CVS Tags: branch-exfmods-tag, checkpoint47b_post, checkpoint47c_post, checkpoint47d_post, checkpoint47d_pre, checkpoint47e_post
Branch point for: branch-exfmods-curt
Changes since 1.2: +16 -2 lines
Diff to previous 1.2
checkpoint47b_post
Merging from release1_p9:
o pkg/seaice
  - removed GOTO's and added taf directives
  - double precision constants to reduce the g77 (Linux)
    to F77 (SGI) differences reported in release1_p8
o tools/genmake
  - added SGI options
o verification/testscript
  - updated to that of checkpoint47a_post
o verification/global_ocean.90x40x15/input/eedata
  - modified for SGI f77 compatibility
o verification/lab_sea
  - added description of sea-ice model
  - added missing matlab routines
  - added test of thermodynamics parallelization
Modified Files:
   doc/tag-index pkg/seaice/SEAICE_FFIELDS.h
   pkg/seaice/SEAICE_PARAMS.h pkg/seaice/adi.F
   pkg/seaice/advect.F pkg/seaice/budget.F pkg/seaice/diffus.F
   pkg/seaice/dynsolver.F pkg/seaice/groatb.F pkg/seaice/growth.F
   pkg/seaice/lsr.F pkg/seaice/ostres.F
   pkg/seaice/seaice_do_diags.F pkg/seaice/seaice_get_forcing.F
   pkg/seaice/seaice_init.F pkg/seaice/seaice_model.F
   pkg/seaice/seaice_readparms.F tools/genmake
   verification/global_ocean.90x40x15/input/eedata
   verification/lab_sea/README
   verification/lab_sea/matlab/lookat_exp1.m
   verification/lab_sea/matlab/lookat_exp2.m
   verification/lab_sea/matlab/lookat_exp3.m
   verification/lab_sea/matlab/lookat_exp4.m
   verification/lab_sea/matlab/lookat_exp5.m
   verification/lab_sea/matlab/lookat_exp6.m
   verification/lab_sea/results/AREAtave.0000000010.data
   verification/lab_sea/results/HEFFtave.0000000010.data
   verification/lab_sea/results/UICEtave.0000000010.data
   verification/lab_sea/results/VICEtave.0000000010.data
   verification/lab_sea/results/output.txt
Added Files:
   verification/lab_sea/seaice.ps
   verification/lab_sea/matlab/lookat_exp7.m
   verification/lab_sea/matlab/mmax.m
   verification/lab_sea/matlab/mypcolor.m
   verification/lab_sea/matlab/myquiver.m
   verification/lab_sea/matlab/readbin.m
   verification/lab_sea/matlab/wysiwyg.m
Removed Files:
   verification/lab_sea/code/KPP_OPTIONS.h


Revision 1.2 - (view) (download) (annotate) - [select for diffs]
Tue Nov 12 20:47:27 2002 UTC (21 years, 7 months ago) by heimbach
Branch: MAIN
CVS Tags: checkpoint46n_post, checkpoint47, checkpoint47a_post
Changes since 1.1: +101 -0 lines
Diff to previous 1.1
Merging from release1_p8 branch:
o New package: pkg/seaice
  Sea ice model by D. Menemenlis (JPL) and Jinlun Zhang (Seattle).
  The sea-ice code is based on Hibler (1979-1980).
  Two sea-ice dynamic solvers, ADI and LSR, are included.
  In addition to computing prognostic sea-ice variables and diagnosing
  the forcing/external data fields that drive the ocean model,
  SEAICE_MODEL also sets theta to the freezing point under sea-ice.
  The implied surface heat flux is then stored in variable
  surfaceTendencyTice, which is needed by KPP package (kpp_calc.F and
  kpp_transport_t.F) to diagnose surface buoyancy fluxes and for the
  non-local transport term.  Because this call precedes model
  thermodynamics, temperature under sea-ice may not be "exactly" at
  the freezing point by the time theta is dumped or time-averaged.


Revision 1.1
Mon Nov 11 22:01:21 2002 UTC (21 years, 7 months ago) by heimbach
Branch: MAIN
Branch point for: release1
FILE REMOVED
file seaice_model.F was initially added on branch release1.


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