From a82a9612ad6aa1d391d6b56358400d8ef52dcccd Mon Sep 17 00:00:00 2001 From: Yi-Cheng Teng - NOAA GFDL <143743249+yichengt900@users.noreply.github.com> Date: Fri, 1 Nov 2024 09:18:10 -0400 Subject: [PATCH] Update Baseline Following Recent Bug Fix PR Merged into COBALT (#107) * Update COBALT tag * Update 1D baseline * update NEP10.COBALT test driver * update NWA12.COBALT test driver --- exps/NEP10.COBALT/driver.sh | 2 +- exps/NWA12.COBALT/driver.sh | 2 +- exps/OM4.single_column.COBALT/ref/ocean.stats | 16 ++++++++-------- src/ocean_BGC | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/exps/NEP10.COBALT/driver.sh b/exps/NEP10.COBALT/driver.sh index 65b7e5513..3514fa2d1 100644 --- a/exps/NEP10.COBALT/driver.sh +++ b/exps/NEP10.COBALT/driver.sh @@ -62,7 +62,7 @@ mv ocean.stats RESTART_24hrs_rst # Define the directories containing the files module load nccmp DIR1="./RESTART_24hrs_rst" -DIR2="./RESTART_48hrs" +DIR2="/gpfs/f6/ira-cefi/proj-shared/github/ci_data/reference/main/NEP10.COBALT/20241031" # Define the files to compare FILES=("$DIR2"/MOM.res*.nc) diff --git a/exps/NWA12.COBALT/driver.sh b/exps/NWA12.COBALT/driver.sh index 6fd7b8fd5..7ec8613f9 100644 --- a/exps/NWA12.COBALT/driver.sh +++ b/exps/NWA12.COBALT/driver.sh @@ -69,7 +69,7 @@ mv ocean.stats RESTART_24hrs_rst # Define the directories containing the files module load nccmp DIR1="./RESTART_24hrs_rst" -DIR2="/gpfs/f6/ira-cefi/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20240912" +DIR2="/gpfs/f6/ira-cefi/proj-shared/github/ci_data/reference/main/NWA12.COBALT/20241031" # Define the files to compare FILES=("$DIR2"/*.nc) diff --git a/exps/OM4.single_column.COBALT/ref/ocean.stats b/exps/OM4.single_column.COBALT/ref/ocean.stats index 255d6955c..c122313a6 100644 --- a/exps/OM4.single_column.COBALT/ref/ocean.stats +++ b/exps/OM4.single_column.COBALT/ref/ocean.stats @@ -1,11 +1,11 @@ Step, Day, Truncs, Energy/Mass, Maximum CFL, Mean Sea Level, Total Mass, Mean Salin, Mean Temp, Frac Mass Err, Salin Err, Temp Err [days] [m2 s-2] [Nondim] [m] [kg] [PSU] [degC] [Nondim] [PSU] [degC] 0, 731595.000, 0, En 0.0000000000000000E+00, CFL 0.00000, SL -0.0000E+00, M 6.97073E+15, S 35.2427, T 6.2462, Me 0.00E+00, Se 0.00E+00, Te 0.00E+00 - 6, 731595.250, 0, En 1.9430731566557828E-06, CFL 0.00273, SL -1.0976E-03, M 6.97073E+15, S 35.2427, T 6.2460, Me -8.57E-10, Se -2.86E-07, Te -2.66E-06 - 12, 731595.500, 0, En 4.1720928837009248E-06, CFL 0.00286, SL -2.1342E-03, M 6.97073E+15, S 35.2427, T 6.2457, Me -7.46E-10, Se -6.81E-07, Te -6.81E-06 - 18, 731595.750, 0, En 1.1711233584828893E-05, CFL 0.00771, SL -3.2696E-03, M 6.97073E+15, S 35.2427, T 6.2459, Me -7.01E-10, Se -9.90E-07, Te -1.00E-05 - 24, 731596.000, 0, En 2.3222260224258834E-05, CFL 0.00834, SL -4.4878E-03, M 6.97072E+15, S 35.2427, T 6.2457, Me -1.14E-09, Se -1.40E-06, Te -1.42E-05 - 30, 731596.250, 0, En 2.8141564688335571E-05, CFL 0.00697, SL -5.5233E-03, M 6.97072E+15, S 35.2428, T 6.2454, Me -1.17E-09, Se -1.93E-06, Te -1.96E-05 - 36, 731596.500, 0, En 3.5463133196222812E-05, CFL 0.00719, SL -6.4934E-03, M 6.97072E+15, S 35.2428, T 6.2451, Me -1.19E-09, Se -2.38E-06, Te -2.42E-05 - 42, 731596.750, 0, En 4.0871903202982405E-05, CFL 0.00769, SL -7.1812E-03, M 6.97072E+15, S 35.2428, T 6.2453, Me -1.11E-09, Se -2.80E-06, Te -2.86E-05 - 48, 731597.000, 0, En 4.6240478947958968E-05, CFL 0.00900, SL -7.7400E-03, M 6.97072E+15, S 35.2428, T 6.2453, Me -8.74E-10, Se -3.06E-06, Te -3.14E-05 + 6, 731595.250, 0, En 1.9430731566546388E-06, CFL 0.00273, SL -1.0976E-03, M 6.97073E+15, S 35.2427, T 6.2460, Me -8.57E-10, Se -2.86E-07, Te -2.66E-06 + 12, 731595.500, 0, En 4.1720467725151035E-06, CFL 0.00286, SL -2.1342E-03, M 6.97073E+15, S 35.2427, T 6.2457, Me -7.46E-10, Se -6.81E-07, Te -6.81E-06 + 18, 731595.750, 0, En 1.1685557354771320E-05, CFL 0.00769, SL -3.2696E-03, M 6.97073E+15, S 35.2427, T 6.2459, Me -7.01E-10, Se -9.90E-07, Te -1.00E-05 + 24, 731596.000, 0, En 2.3175399507961748E-05, CFL 0.00833, SL -4.4877E-03, M 6.97072E+15, S 35.2427, T 6.2457, Me -1.14E-09, Se -1.40E-06, Te -1.42E-05 + 30, 731596.250, 0, En 2.8121131207009207E-05, CFL 0.00696, SL -5.5232E-03, M 6.97072E+15, S 35.2428, T 6.2454, Me -1.17E-09, Se -1.93E-06, Te -1.96E-05 + 36, 731596.500, 0, En 3.5453054955347525E-05, CFL 0.00719, SL -6.4933E-03, M 6.97072E+15, S 35.2428, T 6.2451, Me -1.19E-09, Se -2.38E-06, Te -2.42E-05 + 42, 731596.750, 0, En 4.0859910168740299E-05, CFL 0.00767, SL -7.1811E-03, M 6.97072E+15, S 35.2428, T 6.2453, Me -1.11E-09, Se -2.80E-06, Te -2.86E-05 + 48, 731597.000, 0, En 4.6183029943438057E-05, CFL 0.00894, SL -7.7396E-03, M 6.97072E+15, S 35.2428, T 6.2453, Me -8.74E-10, Se -3.06E-06, Te -3.14E-05 diff --git a/src/ocean_BGC b/src/ocean_BGC index b315a31cf..0de1ab230 160000 --- a/src/ocean_BGC +++ b/src/ocean_BGC @@ -1 +1 @@ -Subproject commit b315a31cf48feeba1d476b3afffaa7e050773635 +Subproject commit 0de1ab230a12999eb139763f40e56920a204d639