Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Links to checkpoint61s: | (view) (download) (annotate) |
| Sticky Tag: |
add package longstep
rename S/R KPP_INIT & PP81_INIT --> KPP_INIT_VARIA & PP81_INIT_VARIA
replace FLT_INIT by 3-steps standard initialization S/R: readparms, init_fixed & ini_varia
Add call to ggl90_init_fixed.F ggl90_init_varia.F
- separate initialisation of "fixed" and "variable" variables
new pkg "down_slope" (+ fix some debug calls)
From Nicolas: add package cheapaml
Add some debug calls.
merge netcdf-support and diagnostics from Patrick Rosendahl into code
added check, readparms, and more diagnostice to pkg/salt_plume also changed package flag from useSaltPlume to useSALT_PLUME
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
Put back IF(useSEAICE) for adjoint (seems benign).
Include SEAICE_SALINITY in adjoint.
pkg/smooth initialization
Make useEXF a runtime flag.
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)
move call to INI_FORCING from PACKAGES_INIT_VARIABLES to INITIALISE_VARIA (more logical anyway, since it's not a package)
Split seaice_init into _fixed, _varia
add hooks for atm2d package
- update calling sequence (comments) - move "CALL REGRID_INIT_VARIA" before "CALL DEBUG_LEAVE()"
add the regrid package hooks
o Add hooks for rbcs checkpointing o Add rbcs_init_varia
Adding template package MYPACKAGE to serve as reference. Does nothing.
use standard names for PTRACERS initialization S/R
rename bulkf_init.F -> bulkf_init_varia.F
Make pkg/profile fully independent of ecco,cost, etc. stuff to be able to use it in pure forward.
o package cost profiles routines to better modularize them.
Moving seaice-related cost to pkg/seaice/
Move call to diag init varia to start of packages init varia - that way we can call diagnostics from other package init varia routines
Added support for pkg/matrix
Make lambda[Theta,Salt]ClimRelax spatially varying.
re-arrange diagnostics pkg initialization: allow each package to extend the available diagnostics list
GCHEM: introduced a useGCHEM runtime flag
o please use lines <73 characters long
Added some debug_msg() lines to track a bug in obcs/exf
updating global1x1_tot
switch btw. 2-level and 3-level checkpointing
o prepare addition of new packages GGL90 and OPPS - new parameters useGGL90 and useOPPS - include call to the new routines at the (hopefully) right places
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
o Adjoint for EBM package (needs further testing) o bug fix for parallel EBM in ebm_zonalmean.F
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.
o couple of small AD fixes
o added some infrastructure to call fizhi and gridalt routines o added package dependencies for fizhi
allow multi-components set-up with a coupler interface and using MPI. exchanges between component and coupler is done in forward_step
each package $PKG_ini_vars calls $PKG_read_pickup: change CD_code to conform to the rule.
use the new thermodynamic Sea-Ice pkg: thSIce
o convert all "INCLUDE_EXTERNAL_FORCING_PACKAGE" defines to the more consistent ALLOW_EXF o passed all the basic verification tests on shelley
o cleaning ALLOW_GRADIENT_CHECK -> ALLOW_GRDCHK
o cleaning some ALLOW_TANGENTLINEAR_RUN -> ALLOW_AUTODIFF
o bug fix in find_alpha.F for MDJWF:
- modif. to alpha = 1/D*( dN/dT - rho*dD/Dt) to account for
change rho -> rho-rhoConst
- replace call find_rho to find_rhonum
o added the [#include "AD_CONFIG.h"] statement to all files that need it for adjoint/tl #defines o re-worked the build logic in genmake2 to support AD_CONFIG.h o removed tools/genmake since it no longer works
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
modification to make gchem more versatile
o disentangled ALLOW_PTRACERS using new ALLOW_GCHEM
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).
Preparing next round of sync MAIN vs. ecco-branch and adjoint of next checkpoint. o somewhat cleaned package initialisation sequence for ctrl/ cost/ ecco/
add new package "land" ; move CALL AIM_INITIALISE from packages_readparms.F to packages_init_fixed.F
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
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-----------------------------------------------------------------------
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.
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
Merging from release1_p8 branch: Adding package parameters and hooks for new seaice package.
* 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
Modified initialisations to enable exf package for MITgcm (without invoking ECCO_PACKAGE).
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.
* Updated adjoint/makefile
o removed "_ecco" from names
o added/modified forward mode options
o added dependent vector option
o tried SVD matrix computation (doesn't work;
too much memory use by TAF)
* Updated flow directives related to FTL
* removed global_sum__g.F (not necessary)
* initialise forward mode anomalies in ctrl_unpack.F
(so far "crude" initialization only).
* Added flag ALLOW_TANGENTLINEAR_RUN complememting
ALLOW_ADJOINT_RUN
* driver routine the_model_main.F needs separate call
to FTL routine G_THE_MAIN_LOOP with parameter list
identical to THE_MAIN_LOOP (TAF doesn't remove arguments).
* added template file tangentlinear_model.F
for forward mode.
Changes to enable field swapping for external forcing consistent with adjoint flow. This allows to avoid in both forward and adjoint mode the reading of fields at every time step.
Bringing comments up to data and formatting for document extraction.
Added a few re-initialisations for TAF.
o Added grdchk package handling o Added passive tracer handling
Modifications and additions to enable automatic differentiation. Detailed info's in doc/notes_c37_adj.txt
AIM (Atmosphere Intermediate Physics) define as a standard package
Made sure each .F and .h file had the CVS keywords Header and Name at its start. Most had header but very few currently have Name, so lots of changes!
Merged changes from branch "branch-atmos-merge" into MAIN (checkpoint34) - substantial modifications to algorithm sequence (dynamics.F) - packaged OBCS, Shapiro filter, Zonal filter, Atmospheric Physics
file packages_init_variables.F was initially added on branch branch-atmos-merge.
This form allows you to request diffs between any two revisions of this file. For each of the two "sides" of the diff, select a symbolic revision name using the selection box, or choose 'Use Text Field' and enter a numeric revision.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |