forked from MITgcm/MITgcm
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Clean and fix pkg/dic initialisation (MITgcm#757)
* move 2 pkg/dic check & stop here Better to have these in one place, and preferably checked early on at the init-fixed stage, so move them from various places in pkg/dic src code. In the future, more check & stop could be added here it needed. * move pkg/dic check & stop to dic_init_fixed.F * Clean and fix pkg/dic inititialisation 1) fix loading of forcing file for the case DIC_forcingCycle = 0 2) fix wrong/inconsistent timing params used for loading initial surface-silica file 3) move all pkg/dic initialise-varia level calls into dic_init_varia.F (previously most were called from gchem_init_vari.F), including DIC_READ_PICKUP and DIC_INI_ATMOS (previously called from dic_surfforcing_init.F) 4) move all forcing field initialisation to dic_ini_forcing.F 5) store logical var "pH_isLoaded" in common block ; this will allow to trigger a specific pH initialisation computation within the main pkg/dic calculation S/R that are called at each time-step 6) improve reading of "pickup_dic" file for future extension (e.g., adding an other field): read and process meta file with error/warning (depending on pickupStrictlyMatch = T/F) if missing file or fields. * surrender to OpenAD * Remove DIC_OPTIONS.h from top of DIC_VARS.h and add it in the (only ?) file that does include DIC_VARS.h without DIC_OPTIONS.h * adjusted to add back DIC_OPTIONS.h in module DIC_VARS * Fix some comments and printed messages * remove/move comments * document improving pkg/dic initialisation
- Loading branch information
Showing
11 changed files
with
487 additions
and
230 deletions.
There are no files selected for viewing
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
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
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
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
Oops, something went wrong.