Merge latest developments from GEOMAR into release#1138
Conversation
…nto geomar_dev
…nto geomar_dev
…terns of NaN during the first time step
… the v1.0.5 Levitus initial data
Feature/add eorca025 standalone
…have been made updated nemo4 example standalone runscripts.
uncomment compiler_mpi in blogin.yaml again
…2014 with FOCI-MOPS and added bugfixes to the config files.
…nto geomar_dev
Bugfix bracket not closed
…om perl installation
(need to overwrite FOCOIFS coupling defaults to be able to use the same NEMO config's as FOCIOIFS)
mandresm
left a comment
mandresm
left a comment
There was a problem hiding this comment.
It all looks great and not problematic. The changes in the src need though to be tested more extensively. Consequently, what I will do will be to create a new branch from this one, and merge almost everything but the changes in src. The changes in src can be then tested more throughly in this PR.
| blogin: | ||
| add_export_vars: | ||
| - "LAPACK_LIB='-mkl=sequential'" | ||
| - "LAPACK_LIB='-qmkl=sequential'" |
There was a problem hiding this comment.
@seb-wahl, can you explain why this flag needs the extra q? I'm curious to understand why is it now needed in HLRN.
| #) | ||
| script_file.write( | ||
| f'#!{self.config.get("sh_interpreter", "/bin/bash")} -l\n' | ||
| f'#!{self.config.get("sh_interpreter", "/bin/bash")}\n' |
There was a problem hiding this comment.
I cannot recall well why, but this breaks stuff in other machines. Suggest to remove it from here as you have it done currently and put it back in the other machines you don't use under sh_interpreter. I'll take care of that.
| #script_file.write( | ||
| # f'#!{self.config.get("sh_interpreter", "/bin/bash")} -l\n' | ||
| #) |
There was a problem hiding this comment.
| #script_file.write( | |
| # f'#!{self.config.get("sh_interpreter", "/bin/bash")} -l\n' | |
| #) |
| if mct_version >= (5, 0): | ||
| self.namcouple += [" $NLOGPRT", " " + str(debug_level) + " 0 1", " $END"] | ||
| # LUCIA (load balancing) is done differently in MCT 5.0 | ||
| if mct_version >= (5,0): |
There was a problem hiding this comment.
| if mct_version >= (5,0): | |
| if mct_version >= (5, 0): |
| if mct_version >= (5,0): | ||
| # In MCT5 you set X Y Z, where X refers to verbosity, Y to timing info and Z to load balancing | ||
| # Here: Set X = debug_level, Y = 0 (no info), Z = 1 (activate load balancing) | ||
| self.namcouple += [" $NLOGPRT", " " + str(debug_level) + " 0 1 ", " $END"] |
There was a problem hiding this comment.
| self.namcouple += [" $NLOGPRT", " " + str(debug_level) + " 0 1 ", " $END"] | |
| self.namcouple += [" $NLOGPRT", " " + str(debug_level) + " 0 1", " $END"] |
| ): | ||
| # Not the rstas.nc soft link to the last, but the actual one for the | ||
| # branch-off date | ||
| if gconfig["run_number"] == 1 and config["lresume"] and gconfig["jobtype"] == "prepcompute" and config.get("norestart", "F") == "F": |
There was a problem hiding this comment.
| if gconfig["run_number"] == 1 and config["lresume"] and gconfig["jobtype"] == "prepcompute" and config.get("norestart", "F") == "F": | |
| if ( | |
| gconfig["run_number"] == 1 | |
| and config["lresume"] | |
| and gconfig["jobtype"] == "prepcompute" | |
| and config.get("norestart", "F") == "F" | |
| ): |
|
Prior to merging "updating" this with |
5 participants
Hi
this will merge mostly FOCIOIFS related developments.
Still contains the bug described by @joakimkjellsson in #1137