Parent Directory
| 
Revision Log
| 
Revision Graph
| Links to HEAD: | (view) (download) (annotate) |
| Sticky Tag: |
compile basal/bottom stress code in lab_sea
define SEAICE_LSR_ZEBRA so that this code is tested (changes results)
- remove documentation for retired CPP flags (SEAICE_GROWTH_LEGACY, SEAICE_CAP_HEFF).
Replace SEAICE_MULTICATEGORY check with "warning" instead of "error+stop". Update SEAICE_OPTIONS.h for main code and "almost-up-to-date" verification experiments.
comment out #define SEAICE_MULTICATEGORY and update comments;
remove blanks
updated version of fwd lab_sea test experiment (no longer SEAICE_GROWTH_LEGACY)
remove MCPHEE_OCEAN_ICE_HEAT_FLUX MCPHEE_OCEAN_ICE_HEAT_FLUX GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR from SEAICE_OPTIONS.h
- SEAICE_OPTIONS.h : define MCPHEE_OCEAN_ICE_HEAT_FLUX and GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR that only serve the purpose of stopping in seaice_check to aknowledge the change of defaults.
- define SEAICE_DISABLE_HEATCONSFIX, until it confirmed by the group that my "fix" is correct, or otherwise.
- update CPPs and run time params (SEAICE_tempFrz0 = -1.96, SEAICE_dTempFrz_dS = 0., to use constant freezing point). - no result chnages.
- rm retired CPPs.
- remove retired CPPs MCPHEE_OCEAN_ICE_HEAT_FLUX, GRADIENT_MIXED_LAYER_TURBULENCE_FACTOR.
- remove SEAICE_AGE and activate SITRACER.
bring OPTIONS files up-to-date
Updating of verification experiments now that SEAICE_SALINITY has been changed to SEAICE_VARIABLE_SALINITY and SEAICE_salinity has been changed to SIsalFRAC. Noticed that ICE2WATR was still being used to initialize the HSALT in the lab_sea verification experiments. Removed it from the code but that broke testreport. Hence, some lab_sea/results/*txt files had to be replaced. Now pretty sure that ICE2WATR has been complete neutralized. : Modified Files: : lab_sea/results/output_adm.evp.txt : lab_sea/results/output_adm.noseaicedyn.txt : lab_sea/results/output_adm.txt : lab_sea/input_ad/data.seaice lab_sea/input_ad.evp/data.seaice : lab_sea/input_ad.noseaicedyn/data.seaice : lab_sea/input.salt_plume/data.seaice : lab_sea/code_ad/SEAICE_OPTIONS.h lab_sea/code/SEAICE_OPTIONS.h : 1D_ocean_ice_column/input_ad/data.seaice : 1D_ocean_ice_column/input/data.seaice : 1D_ocean_ice_column/code_ad/SEAICE_OPTIONS.h : 1D_ocean_ice_column/code/SEAICE_OPTIONS.h : seaice_obcs/input/data.seaice : seaice_obcs/code/SEAICE_OPTIONS.h : global_ocean.cs32x15/code_ad/SEAICE_OPTIONS.h : global_ocean.cs32x15/code/SEAICE_OPTIONS.h : : offline_exf_seaice/code_ad/SEAICE_OPTIONS.h : offline_exf_seaice/code/SEAICE_OPTIONS.h : ----------------------------------------------------------------------
Start a seaice tracer-like code but for now confinded to ice age
define SEAICE_GROWTH_LEGACY and SEAICE_SOLVE4TEMP_LEGACY (except in global_ocean.cs32x15 which does not call seaice_growth)
revision of lab_sea forward model tests ======================================= o clean-up of lab_sea code directory. o addition of SEAICE_VARIABLE_FREEZING_POINT.
#define SEAICE_ALLOW_FREEDRIFT to compile and run the free drift code in fwd and adj modes. Note: this has no impact on the result, since SEAICEuseFREEDRIFT has not been set true.
SEAICE_AGE_VOL: adding option to use volume instead of area for integrating SEAICE_AGE
- define the CPP flag to include clipping of zeta in EVP code to override the default for backward compatibility
define SEAICE_ALLOW_CLIPVELS to override default for backward compatibility
added sea ice age tracer; #define SEAICE_AGE in SEAICE_PARAMS.h
o pkg/seaice: use different time constant for melting (SEAICE_gamma_t) and freezing (SEAICE_gamma_t_frz) ice due to mixed layer temperature
updating files verification/lab_sea/code to remove obsolete options and to prepare for a salt_plume test
adding ice salinity HSALT as a prognostic variable
These all came back and so we are deleting them again. Fingers crossed!
pkg/seaice option SEAICE_EXTERNAL_FORCING requires pkg/exf
o convert all "INCLUDE_EXTERNAL_FORCING_PACKAGE" defines to the more consistent ALLOW_EXF o passed all the basic verification tests on shelley
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
Cleaned up CPP_OPTIONS.h and fixed configuration for expts using EXF, or SEAICE.
o passes more of the verification tests
o global_with_exf is still a problem -- something is wrong
o used GCC version 3.2.2 20030222 (Red Hat Linux 3.2.2-5)
Sun Oct 5 00:07:47 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 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 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 -- 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 -- 5 6 7 6 16 16 16 16 7 7 0 7 16 16 16 16 N/O advect_xz
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 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 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 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 4 9 7 8 6 10 6 9 5 4 7 6 5 4 5 5 5 FAIL 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
Commented out package selection - gives wrong answers but we'll sort that out shortly.
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
modified verification/lab_sea/code/SEAICE_OPTIONS.EXF_FLUXES.h
verification/lab_sea/code/SEAICE_OPTIONS.h
o added verification/lab_sea as per release1_p12_pre
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
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
file SEAICE_OPTIONS.h 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.
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |