Import get_bgc_namelist only in subroutine where it is needed. #225
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
jmaerz
approved these changes
Jan 25, 2023
There was a problem hiding this comment.
Hi @TomasTorsvik , from my side, it's fine. Admittedly, I would be tempted to disregard this fine-grained import in ncout_hamocc.F90, once we make it to a module, so that the import is getting less lengthy and cumbersome. But this is another discussion. So go ahead. Approved.
|
Maybe one question, though. Any idea, why the testing is with this change now failing with a time-out (and not earlier, asking wrt the intel compiler)? |
Don't know why this happens. The macos check has been failing for a while, but the others usually work. The timeout (at 900s) happens when running the fuk95 test case, and the other Intel check runs this case in 366s. I re-run the check to see if it was just a one-off event. |
|
I did already the same ;-) - and it also failed. |
|
Hah, seems like the test-case now went through and the time might be just on the edge of the set time limit for the test run. |
jmaerz
added a commit
that referenced
this pull request
Jan 25, 2023
* Dynamic mapping of pore water tracers to ocean tracers (#192) * Initial restructuring of sediment-related tracer declaration and initialization * Introducing mapping function * Remove unncessary comments * Fixed diagnostics bug and updated index naming * Added initial support for NUOPC driver. * Lon-lat variable sediment porosity (#189) Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting. * Added wave forcing fields. * Renamed folder for MCT driver. * Moved MCT specific file from drivers/cpl_share/ to drivers/mct/. * Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90. * Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran. * Remove redundant definition of kOBL. * Redefine kOBL, cast as integer * Fixing variable sediment porosity - field initialization in case of `sedbypass=true` (#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt * Hamocc hybrid coord2 (#179) Make the surface mixed layer depth fractional index `hOBL` available for use in iHAMOCC, and adjust the internal iHAMOCC index `kmle` according to `hOBL`. Default value `kmle = 2` is retained for consistency with isopycnic coordinates. * Fix porosity read (#201) * Fixing the reading of variable porosity input field in preparation for the NorESM 2.0.6 release Cherry-picked from private Ncycleprivate branch 0d56930e2fdd62caba964d375b57304942568926 * Provide number of layers (3rd dim) via ks and not hard-coded * minor clean-up * Correct unit of diagnostic variable dp_trc. * Made conservation and checksum diagnostics selectable by namelist options (default off). * pCO2, Piston velocity and solubility output (#202) * add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility) * Bugfix pnetcdf (#208) * Add variables used by PNETCDF to explicit use staements. * Move implicit none statments * update explicit use statement for pnetcdf * fixed units and renamed calcium burial to CaCO3 burial (#212) Fixed sediment clay units. * Add option for surface pH output (#221) * Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90 * Import get_bgc_namelist only in subroutine where it is needed. (#225) Co-authored-by: Mats Bentsen <mben@norceresearch.no> Co-authored-by: Tomas Torsvik <tomas.torsvik.work@gmail.com> Co-authored-by: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Co-authored-by: Jörg Schwinger <jorg.schwinger@norceresearch.no>
jmaerz
added a commit
that referenced
this pull request
Feb 9, 2023
* Dynamic mapping of pore water tracers to ocean tracers (#192) * Initial restructuring of sediment-related tracer declaration and initialization * Introducing mapping function * Remove unncessary comments * Fixed diagnostics bug and updated index naming * Added initial support for NUOPC driver. * Lon-lat variable sediment porosity (#189) Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting. * Added wave forcing fields. * Renamed folder for MCT driver. * Moved MCT specific file from drivers/cpl_share/ to drivers/mct/. * Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90. * Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran. * Remove redundant definition of kOBL. * Redefine kOBL, cast as integer * Fixing variable sediment porosity - field initialization in case of `sedbypass=true` (#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt * This is the first commit of MKS units. All variables in the subroutines have been converted to MKS [meter, kg, seconds] instead of CGS [cm, gram, seconds] with necessary coefficients. The default option which is CGS reproduce old results. The new option MKS cannot reproduce because of machine precision. * Hamocc hybrid coord2 (#179) Make the surface mixed layer depth fractional index `hOBL` available for use in iHAMOCC, and adjust the internal iHAMOCC index `kmle` according to `hOBL`. Default value `kmle = 2` is retained for consistency with isopycnic coordinates. * BLOM CIME cpp updates to run in NorESM * bug fixes for the CGS MKS conversion * cesm thermal forcing bug fixes for reproducibility * BLOM MKS update to export winds into the CESM using proper units. * input values in ocn_in case is updated for mks setup * default cgsmks value changed * Initialize some variables in the k-epsilon model. * Fix porosity read (#201) * Fixing the reading of variable porosity input field in preparation for the NorESM 2.0.6 release Cherry-picked from private Ncycleprivate branch 0d56930e2fdd62caba964d375b57304942568926 * Provide number of layers (3rd dim) via ks and not hard-coded * minor clean-up * Correct unit of diagnostic variable dp_trc. * Made conservation and checksum diagnostics selectable by namelist options (default off). * pCO2, Piston velocity and solubility output (#202) * add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility) * Bugfix pnetcdf (#208) * Add variables used by PNETCDF to explicit use staements. * Move implicit none statments * update explicit use statement for pnetcdf * fixed units and renamed calcium burial to CaCO3 burial (#212) Fixed sediment clay units. * - Made the "fuk95" configuration work with MKS units. - Removed "CGS" CPP flag. - Changed some unit conversion factors from variables to parameters. - Introduced rho0 (= 1/alpha0) parameter. - Updated copyright statements. * Correct unit conversion of mixed layer depth to pressure. * Updated NorESM coupling scripts for the use of MKS units. * Fixed check of unit system when building as NorESM component. * Add option for surface pH output (#221) * Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90 * Import get_bgc_namelist only in subroutine where it is needed. (#225) * fix missing ' (#228) Fixing a missing ' that only showed up when using `cisonew` --------- Co-authored-by: Mats Bentsen <mben@norceresearch.no> Co-authored-by: Tomas Torsvik <tomas.torsvik.work@gmail.com> Co-authored-by: Mehmet Ilicak <milicak@itu.edu.tr> Co-authored-by: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Co-authored-by: Jörg Schwinger <jorg.schwinger@norceresearch.no>
jmaerz
pushed a commit
to jmaerz/BLOM
that referenced
this pull request
Aug 9, 2023
jmaerz
added a commit
to jmaerz/BLOM
that referenced
this pull request
Aug 9, 2023
* Dynamic mapping of pore water tracers to ocean tracers (NorESMhub#192) * Initial restructuring of sediment-related tracer declaration and initialization * Introducing mapping function * Remove unncessary comments * Fixed diagnostics bug and updated index naming * Added initial support for NUOPC driver. * Lon-lat variable sediment porosity (NorESMhub#189) Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting. * Added wave forcing fields. * Renamed folder for MCT driver. * Moved MCT specific file from drivers/cpl_share/ to drivers/mct/. * Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90. * Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran. * Remove redundant definition of kOBL. * Redefine kOBL, cast as integer * Fixing variable sediment porosity - field initialization in case of `sedbypass=true` (NorESMhub#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt * Hamocc hybrid coord2 (NorESMhub#179) Make the surface mixed layer depth fractional index `hOBL` available for use in iHAMOCC, and adjust the internal iHAMOCC index `kmle` according to `hOBL`. Default value `kmle = 2` is retained for consistency with isopycnic coordinates. * Fix porosity read (NorESMhub#201) * Fixing the reading of variable porosity input field in preparation for the NorESM 2.0.6 release Cherry-picked from private Ncycleprivate branch 0d56930e2fdd62caba964d375b57304942568926 * Provide number of layers (3rd dim) via ks and not hard-coded * minor clean-up * Correct unit of diagnostic variable dp_trc. * Made conservation and checksum diagnostics selectable by namelist options (default off). * pCO2, Piston velocity and solubility output (NorESMhub#202) * add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility) * Bugfix pnetcdf (NorESMhub#208) * Add variables used by PNETCDF to explicit use staements. * Move implicit none statments * update explicit use statement for pnetcdf * fixed units and renamed calcium burial to CaCO3 burial (NorESMhub#212) Fixed sediment clay units. * Add option for surface pH output (NorESMhub#221) * Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90 * Import get_bgc_namelist only in subroutine where it is needed. (NorESMhub#225) Co-authored-by: Mats Bentsen <mben@norceresearch.no> Co-authored-by: Tomas Torsvik <tomas.torsvik.work@gmail.com> Co-authored-by: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Co-authored-by: Jörg Schwinger <jorg.schwinger@norceresearch.no>
jmaerz
added a commit
to jmaerz/BLOM
that referenced
this pull request
Aug 9, 2023
…b#232) * Dynamic mapping of pore water tracers to ocean tracers (NorESMhub#192) * Initial restructuring of sediment-related tracer declaration and initialization * Introducing mapping function * Remove unncessary comments * Fixed diagnostics bug and updated index naming * Added initial support for NUOPC driver. * Lon-lat variable sediment porosity (NorESMhub#189) Introducing a static 3D sediment porosity field that can be optionally read in with effects on molecular pore water diffusion and shifting. * Added wave forcing fields. * Renamed folder for MCT driver. * Moved MCT specific file from drivers/cpl_share/ to drivers/mct/. * Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90. * Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran. * Remove redundant definition of kOBL. * Redefine kOBL, cast as integer * Fixing variable sediment porosity - field initialization in case of `sedbypass=true` (NorESMhub#198) * Removing bodensed - Initialization of sediment parameters and fields now in mo_sedmnt * This is the first commit of MKS units. All variables in the subroutines have been converted to MKS [meter, kg, seconds] instead of CGS [cm, gram, seconds] with necessary coefficients. The default option which is CGS reproduce old results. The new option MKS cannot reproduce because of machine precision. * Hamocc hybrid coord2 (NorESMhub#179) Make the surface mixed layer depth fractional index `hOBL` available for use in iHAMOCC, and adjust the internal iHAMOCC index `kmle` according to `hOBL`. Default value `kmle = 2` is retained for consistency with isopycnic coordinates. * BLOM CIME cpp updates to run in NorESM * bug fixes for the CGS MKS conversion * cesm thermal forcing bug fixes for reproducibility * BLOM MKS update to export winds into the CESM using proper units. * input values in ocn_in case is updated for mks setup * default cgsmks value changed * Initialize some variables in the k-epsilon model. * Fix porosity read (NorESMhub#201) * Fixing the reading of variable porosity input field in preparation for the NorESM 2.0.6 release Cherry-picked from private Ncycleprivate branch 0d56930e2fdd62caba964d375b57304942568926 * Provide number of layers (3rd dim) via ks and not hard-coded * minor clean-up * Correct unit of diagnostic variable dp_trc. * Made conservation and checksum diagnostics selectable by namelist options (default off). * pCO2, Piston velocity and solubility output (NorESMhub#202) * add pCO2m (moist), CO2 piston velocity and solubility output - caution: kwco2 piston velocity now really holds only piston velocity (and not times solubility) * Bugfix pnetcdf (NorESMhub#208) * Add variables used by PNETCDF to explicit use staements. * Move implicit none statments * update explicit use statement for pnetcdf * fixed units and renamed calcium burial to CaCO3 burial (NorESMhub#212) Fixed sediment clay units. * - Made the "fuk95" configuration work with MKS units. - Removed "CGS" CPP flag. - Changed some unit conversion factors from variables to parameters. - Introduced rho0 (= 1/alpha0) parameter. - Updated copyright statements. * Correct unit conversion of mixed layer depth to pressure. * Updated NorESM coupling scripts for the use of MKS units. * Fixed check of unit system when building as NorESM component. * Add option for surface pH output (NorESMhub#221) * Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90 * Import get_bgc_namelist only in subroutine where it is needed. (NorESMhub#225) * fix missing ' (NorESMhub#228) Fixing a missing ' that only showed up when using `cisonew` --------- Co-authored-by: Mats Bentsen <mben@norceresearch.no> Co-authored-by: Tomas Torsvik <tomas.torsvik.work@gmail.com> Co-authored-by: Mehmet Ilicak <milicak@itu.edu.tr> Co-authored-by: Tomas Torsvik <43031053+TomasTorsvik@users.noreply.github.com> Co-authored-by: Jörg Schwinger <jorg.schwinger@norceresearch.no>
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.
I think it makes sense to move the module import statement to the subroutine where
get_bgc_namelistis used. Not sure why it was placed in the main body ofmo_bgcmeanin the first place.