<html xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="Generator" content="Microsoft Word 15 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:"Cambria Math";
panose-1:2 4 5 3 5 4 6 3 2 4;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
font-size:11.0pt;
font-family:"Calibri",sans-serif;}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri",sans-serif;
color:windowtext;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 72.0pt 72.0pt 72.0pt;}
div.WordSection1
{page:WordSection1;}
--></style>
</head>
<body lang="EN-AU" link="blue" vlink="purple" style="word-wrap:break-word">
<div class="WordSection1">
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">The cleanest solution is to make a new branch off `master` and new pr with that branch.<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US">Ed<o:p></o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<p class="MsoNormal"><span style="mso-fareast-language:EN-US"><o:p> </o:p></span></p>
<div style="border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm 0cm 0cm">
<p class="MsoNormal"><b><span style="font-size:12.0pt;color:black">From: </span></b><span style="font-size:12.0pt;color:black">MITgcm-devel <mitgcm-devel-bounces@mitgcm.org> on behalf of Martin Losch <Martin.Losch@awi.de><br>
<b>Reply to: </b>"MITgcm-devel@mitgcm.org" <MITgcm-devel@mitgcm.org><br>
<b>Date: </b>Thursday, 24 September 2020 at 16:03<br>
<b>To: </b>MITgcm-devel <MITgcm-devel@mitgcm.org><br>
<b>Subject: </b>Re: [MITgcm-devel] After PR #371 (tst_2+2_bug_fix) got merged in<o:p></o:p></span></p>
</div>
<div>
<p class="MsoNormal"><o:p> </o:p></p>
</div>
<p class="MsoNormal">Hi,<br>
<br>
Oliver is right, the solution on ollie and on my MacOS with POSIX sed is to remove the first blank in the new line ***before*** the “\”. The blank after the backslash is needed to that it’s not interpreted as “\n”<br>
<br>
How do I do this now. New branch with new PR or do I use the old branch, add the fix and make a new PR?<br>
<br>
Martin<br>
<br>
> On 23. Sep 2020, at 17:04, Oliver Jahn <jahn@mit.edu> wrote:<br>
> <br>
> Looks like this:<br>
> <br>
> sed -e "/^ *\&PARM03/a\\<br>
> \ nTimeSteps=$Dbl," data.tst > data.tmp_$$<br>
> <br>
> introduces 2 spaces before "nTimeSteps" which the trips up a later part<br>
> of the script:<br>
> <br>
> Dbl=`sed -n 's/^ nTimeSteps=//p' data.tst | sed 's/,//g'`<br>
> <br>
> Remove the space before the backslash in the new sed command? I assume<br>
> the escaped space is somehow needed for POSIX???<br>
> <br>
> Oliver<br>
> <br>
> <br>
> On 2020-09-23 10:45, Martin Losch wrote:<br>
>> That’s indeed interesting. This can only mean that the sed commands are not always doing, what they are supposed to do. I cannot inspect this right now, but will do so asap for ollie. I did test this for both POSIX sed and GNU sed.<br>
>> <br>
>> Martin<br>
>> <br>
>>> On 23. Sep 2020, at 16:12, Jean-Michel Campin <jmc@mit.edu> wrote:<br>
>>> <br>
>>> Hi Martin and Oliver,<br>
>>> <br>
>>> There is something unclear regarding the effect of this PR #371:<br>
>>> Since I merged it after mid-night yesterday, only got used in faily tests<br>
>>> last night. And for few restart test where some experiments were failing the <br>
>>> test, I got a big improvement and many more to pass.<br>
>>> <br>
>>> I still have not yet all output back, but the one affected are:<br>
>>> a) 1 more pass on villon (linux_amd64_gfortran.dvlp):<br>
>>> Y Y Y Y pass <- global_ocean.gm_k3d<br>
>>> ---<br>
>>>> Y Y Y Y FAIL (4) - global_ocean.gm_k3d<br>
>>> b) 5 more pass on engaging (linux_amd64_open64+mpi.fast):<br>
>>> 45c45<br>
>>> < Y Y Y Y pass <- global_with_exf<br>
>>> ---<br>
>>>> Y Y Y Y FAIL (4) - global_with_exf<br>
>>> 56,59c56,59<br>
>>> < Y Y Y Y pass <- isomip<br>
>>> < Y Y Y Y pass <- isomip.htd<br>
>>> < Y Y Y Y pass <- isomip.icefront<br>
>>> < Y Y Y Y pass <- isomip.obcs<br>
>>> ---<br>
>>>> Y Y Y Y FAIL (4) - isomip<br>
>>>> Y Y Y Y FAIL (4) - isomip.htd<br>
>>>> Y Y Y Y FAIL (4) - isomip.icefront<br>
>>>> Y Y Y Y FAIL (4) - isomip.obcs<br>
>>> c) and the largest changes are from "ollie" (before/after)i, only the "fast" ones:<br>
>>> 46:97 rs_ollie-i_20200922_1 restart linux_ia64_ifort_ollie+mpi.fast<br>
>>> 94:97 rs_ollie-i_20200923_1 restart linux_ia64_ifort_ollie+mpi.fast<br>
>>> And:<br>
>>> 50:96 rs_ollie-c_20200922_1 restart linux_ia64_cray_ollie+mpi.fast<br>
>>> 92:96 rs_ollie-c_20200923_1 restart linux_ia64_cray_ollie+mpi.fast<br>
>>> <br>
>>> The 1 change in "do_tst_2+2" is unlikely to change anything (because it's just
<br>
>>> for log file and report, and only excecuted once for the first experiment).<br>
>>> So it's something with the 2 changes in "tst_2+2", and may be related to <br>
>>> disk/system missing an updated file (since it's more common with "fast" than "devel") ?<br>
>>> Not very clear.<br>
>>> <br>
>>> Cheers,<br>
>>> Jean-Michel<br>
>>> _______________________________________________<br>
>>> MITgcm-devel mailing list<br>
>>> MITgcm-devel@mitgcm.org<br>
>>> <a href="http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel">
http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel</a><br>
>> <br>
>> _______________________________________________<br>
>> MITgcm-devel mailing list<br>
>> MITgcm-devel@mitgcm.org<br>
>> <a href="http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel">
http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel</a><br>
>> <br>
> _______________________________________________<br>
> MITgcm-devel mailing list<br>
> MITgcm-devel@mitgcm.org<br>
> <a href="http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel">
http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel</a><br>
<br>
_______________________________________________<br>
MITgcm-devel mailing list<br>
MITgcm-devel@mitgcm.org<br>
<a href="http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel">http://mailman.mitgcm.org/mailman/listinfo/mitgcm-devel</a><br>
<br>
<o:p></o:p></p>
</div>
<p style="font-size:10pt; line-height:10pt; font-family: Calibri,sans-serif;"><br>
<br>
University of Tasmania Electronic Communications Policy (December, 2014). <br>
This email is confidential, and is for the intended recipient only. Access, disclosure, copying, distribution, or reliance on any of it by anyone outside the intended recipient organisation is prohibited and may be a criminal offence. Please delete if obtained
in error and email confirmation to the sender. The views expressed in this email are not necessarily the views of the University of Tasmania, unless clearly intended otherwise.
</p>
</body>
</html>