Update to CICE-Consortium main #422117fc5d Oct 9, 2022 #102
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
CICE-Consortium#746) * Added dxgrow, dygrow to facilitate variable spaced grid. Modified rectgrid to generate grid from center outward using growth factor * Adding vargrid namelist options. * Refactored rectgrid to compute dx/dy first. Then ULON/ULAT. Added scale_dxdy flag to check of want grid spacing scaled. Renamed dxgrow/dygrow to dxscale/dyscale. * Added method to check for odd nx_global/ny_global when applying grid spacing scale factors * Update comments before computing dx/dy * Update comments when checking for even/odd * made grid_lonref, grid_latref namelist varaibles. Removed vargrid_suite.ts. Updated the box nml to specify the default grid_lonref and grid_latref for future reference. * Change grid_lonref/grid_latref to lonrefrect,latrefrect. Reduce default vargrid tests to 3 per B,C,CD grid. * Make new subroutine rectgrid_scale_dxdy to implemnet grid scaling. Remove explicit latrefrec/lonrefrect from set_nml. Make dxscale,dyscale,latrefrec,lonrefrec double precition in ice_in * Add set_nml.scale1 to test vargrid with dxscale/dyscale = 1.d0 * Remove lonrefrec/latrefrec from boxnodyn * Add lonrefrect, latrafrect to documentation * Inserted new scaled grid varibles in alphabetical order in documentation
…CE-Consortium#754) * Update Pull Request Template, add question about updating Icepack
* Refactored evp sub cycling loop * corrected indent and case for dyn_haloUptdate
…um#758) In 3fedc78 (Allow for read of tlat, tlon, anglet with popgrid (CICE-Consortium#463), 2020-06-24), ice_grid::init_grid2 was changed so that ice_grid::Tlatlon, which computes the TLAT and TLON arrays from ULAT and ULON, is only called if the private module variable 'l_readCenter' is false. The idea is that if the grid file contains a variable 'anglet', then it is assumed that it also contains variables 'tlon' and 'tlat', and so these fields are read directly instead of being computed. This logic, however, was only implemented in ice_grid::popgrid_nc, which sets 'l_readCenter' depending on the presence or absence of 'anglet' in the grid file. This means that if 'popgrid_nc' is not called (for example with "grid_format='bin'", in which case init_grid2 calls 'popgrid' and not 'popgrid_nc'), then 'l_readCenter' is used uninitialized in init_grid2, and so it's possible that 'Tlatlon' is not called, if 'l_readCenter' happens to be initialized to true. This in turns leads to 'TLAT' and 'TLON' being uninitialized, and the code failing when accessing these arrays if compiling with NaN initialization. Fix this by initializing 'l_readCenter' at the beginning of init_grid2, such that it is initialized for all choices of 'grid_format' and 'grid_type'. Remove the initialization in 'popgrid_nc'.
* move deformation out of loop for B grid only * Moved C and CD grid deformations * correct location of bgrid deformation
* Update dEdd implementation - Update Icepack with several fixes (changes answers for tr_aero) - Update bgc aerosol table to higher precision - Add modal aerosol tests - Update test suites * Update Icepack including dEdd fixes
) * Update grid averaging for tmass, aice, uvelT, vvelT - Update tmass and aice T2U mapping, switch from "F" to "S", F was backwards compatible but not correct (changes answers) - Update ocean forcing T2U averaging in ocn_data_ncar_init, change "F" to "A". - Update uvelT, vvelT averaging in step_therm1, change from 4 point average to U2TA (changes answers for highfreq=.true.) - Remove history grids not needed (i.e. ustr3Dz) * Refactor uvelT, vvelT implementation
Mention that CICE must be cloned with '--recurse-submodules' for Icepack to also be cloned, formatting the 'git clone' command as a code block, and fix the link to the Git Workflow Guide.
…3SMIcepackDEV Oct 9, 2022
|
I have confirmed this merge now makes the E3SMIcepackDEV branch bit-for-bit with the current Consortium main, #422117fc5d. This also brings E3SMIcepackDEV fully up to date with CICE Consortium main #422117fc5d. |
eclare108213
approved these changes
Oct 10, 2022
| "``dyrect``", "real", "y-direction grid spacing for rectangular grid in cm", "0.0" | ||
| "``dyscale``", "real", "user defined rectgrid y-grid scale factor", "1.0" |
There was a problem hiding this comment.
Is the variable rectgrid scaling not described elsewhere in the docs? I don't see it. Would be good to add a brief description somewhere, maybe in one of the sections that mention the box tests like 3.3.1.3.1. box2001.
There was a problem hiding this comment.
Agree this should be addressed on Consortium main and should have been addressed better when the variable grid stuff was added. I have added an issue so we don't forget, CICE-Consortium#770.
18 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR checklist
Update to CICE-Consortium main #422117fc5d Oct 9, 2022
apcraig
This is bit-for-bit with #422117fc5d on consortium main, https://github.com/CICE-Consortium/Test-Results/wiki/cice_by_hash_forks#14c8157acaca854d438a2f6dee58ca5edea48317
This bring in