From b95680665b0096243b75a138818e750b94c07d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Fri, 18 Jun 2021 09:34:35 +0100 Subject: [PATCH 1/8] Added new variables for density following adjoint --- global_oce_cs32/input_ad.sens/data.ecco | 32 +++++++++++++++---------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 7d4b2861..eb80aad0 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -11,22 +11,28 @@ gencost_barfile(1) = 'm_boxmean_theta', gencost_mask(1) = 'south30_mask', gencost_name(1) = 'south30_mean_theta', +# These are the new variables needed for density following adjoint feature + gencost_useDensityMask(1) = .TRUE., + gencost_refPressure(1) = 0.0, + gencost_sigmaLow(1) = 25, + gencost_sigmaHigh(1) = 27, +########### gencost_outputlevel(1)=1, mult_gencost(1) = 1.D+07, # - gencost_avgperiod(2) = 'step', - gencost_barfile(2) = 'm_horflux_vol', - gencost_mask(2) = 'north10_mask', - gencost_name(2) = 'north10_flux_vol', - gencost_outputlevel(2)=1, - mult_gencost(2) = 1., +# gencost_avgperiod(2) = 'step', +# gencost_barfile(2) = 'm_horflux_vol', +# gencost_mask(2) = 'north10_mask', +# gencost_name(2) = 'north10_flux_vol', +# gencost_outputlevel(2)=1, +# mult_gencost(2) = 1., # - gencost_avgperiod(3) = 'step', - gencost_barfile(3) = 'm_trVol_step', - gencost_mask(3) = 'north10_mask', - gencost_name(3) = 'moc_north10', - gencost_outputlevel(3)=1, - mult_gencost(3) = 1., +# gencost_avgperiod(3) = 'step', +# gencost_barfile(3) = 'm_trVol_step', +# gencost_mask(3) = 'north10_mask', +# gencost_name(3) = 'moc_north10', +# gencost_outputlevel(3)=1, +# mult_gencost(3) = 1., # - & + / # From 6305b185c16027b7689854bfb2435aaf675d683a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Fri, 18 Jun 2021 11:00:13 +0100 Subject: [PATCH 2/8] Added mask for test case --- global_oce_cs32/input_ad.sens/data.ecco | 6 +++--- .../input_ad.sens/density_mask_SAUSC | Bin 0 -> 421200 bytes .../input_ad.sens/density_mask_SAUSK | Bin 0 -> 200 bytes .../input_ad.sens/density_mask_SAUST | Bin 0 -> 1920 bytes 4 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUSC create mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUSK create mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUST diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index eb80aad0..09253e6b 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -2,15 +2,15 @@ # ECCO cost functions # ******************* &ECCO_COST_NML - & + / # *************************** # ECCO generic cost functions # *************************** &ECCO_GENCOST_NML gencost_avgperiod(1) = 'step', gencost_barfile(1) = 'm_boxmean_theta', - gencost_mask(1) = 'south30_mask', - gencost_name(1) = 'south30_mean_theta', + gencost_mask(1) = 'density_mask_SAUS', + gencost_name(1) = 'density_SAUS_mean_theta', # These are the new variables needed for density following adjoint feature gencost_useDensityMask(1) = .TRUE., gencost_refPressure(1) = 0.0, diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUSC b/global_oce_cs32/input_ad.sens/density_mask_SAUSC new file mode 100644 index 0000000000000000000000000000000000000000..2110a890c38242b157c0ecf9de82d0c545752166 GIT binary patch literal 421200 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 literal 0 HcmV?d00001 diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUSK b/global_oce_cs32/input_ad.sens/density_mask_SAUSK new file mode 100644 index 0000000000000000000000000000000000000000..ca469ab1f90faf3adcc44fe8ac5e14df9c818e79 GIT binary patch literal 200 RcmcC-U|_JPB4!vM003yG4($K{ literal 0 HcmV?d00001 diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUST b/global_oce_cs32/input_ad.sens/density_mask_SAUST new file mode 100644 index 0000000000000000000000000000000000000000..a8ccf86371ca4f5fba3883a27e443c0bd58382aa GIT binary patch literal 1920 mcmZQz7zLvtFd71bB?N3&ty)bA9xU!2b;oE3jD`T|Apig(wHna? literal 0 HcmV?d00001 From d8defc34bace53a1f63923fd47cc6f68dcebf4cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Fri, 21 Jan 2022 12:49:48 +0000 Subject: [PATCH 3/8] Changes to mask file used in testcase --- global_oce_cs32/input_ad.sens/data.ecco | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 09253e6b..90bc4dec 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -9,12 +9,12 @@ &ECCO_GENCOST_NML gencost_avgperiod(1) = 'step', gencost_barfile(1) = 'm_boxmean_theta', - gencost_mask(1) = 'density_mask_SAUS', - gencost_name(1) = 'density_SAUS_mean_theta', + gencost_mask(1) = 'south30_mask', + gencost_name(1) = 'south30_mean_theta', # These are the new variables needed for density following adjoint feature gencost_useDensityMask(1) = .TRUE., gencost_refPressure(1) = 0.0, - gencost_sigmaLow(1) = 25, + gencost_sigmaLow(1) = 23, gencost_sigmaHigh(1) = 27, ########### gencost_outputlevel(1)=1, From d389bd7e7426d5571b655d26a9941ca514910204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Mon, 31 Jan 2022 11:52:53 +0000 Subject: [PATCH 4/8] removed unnecessary files --- .../input_ad.sens/density_mask_SAUSC | Bin 421200 -> 0 bytes .../input_ad.sens/density_mask_SAUSK | Bin 200 -> 0 bytes .../input_ad.sens/density_mask_SAUST | Bin 1920 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUSC delete mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUSK delete mode 100644 global_oce_cs32/input_ad.sens/density_mask_SAUST diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUSC b/global_oce_cs32/input_ad.sens/density_mask_SAUSC deleted file mode 100644 index 2110a890c38242b157c0ecf9de82d0c545752166..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421200 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 diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUSK b/global_oce_cs32/input_ad.sens/density_mask_SAUSK deleted file mode 100644 index ca469ab1f90faf3adcc44fe8ac5e14df9c818e79..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 200 RcmcC-U|_JPB4!vM003yG4($K{ diff --git a/global_oce_cs32/input_ad.sens/density_mask_SAUST b/global_oce_cs32/input_ad.sens/density_mask_SAUST deleted file mode 100644 index a8ccf86371ca4f5fba3883a27e443c0bd58382aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1920 mcmZQz7zLvtFd71bB?N3&ty)bA9xU!2b;oE3jD`T|Apig(wHna? From 296cb30e21d9e37553722a0629e84ce725f0c462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Mon, 31 Jan 2022 11:55:59 +0000 Subject: [PATCH 5/8] Added 4th gencost contribution --- global_oce_cs32/input_ad.sens/data.ecco | 41 ++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 90bc4dec..9c18b668 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -11,28 +11,33 @@ gencost_barfile(1) = 'm_boxmean_theta', gencost_mask(1) = 'south30_mask', gencost_name(1) = 'south30_mean_theta', -# These are the new variables needed for density following adjoint feature - gencost_useDensityMask(1) = .TRUE., - gencost_refPressure(1) = 0.0, - gencost_sigmaLow(1) = 23, - gencost_sigmaHigh(1) = 27, -########### gencost_outputlevel(1)=1, mult_gencost(1) = 1.D+07, # -# gencost_avgperiod(2) = 'step', -# gencost_barfile(2) = 'm_horflux_vol', -# gencost_mask(2) = 'north10_mask', -# gencost_name(2) = 'north10_flux_vol', -# gencost_outputlevel(2)=1, -# mult_gencost(2) = 1., + gencost_avgperiod(2) = 'step', + gencost_barfile(2) = 'm_horflux_vol', + gencost_mask(2) = 'north10_mask', + gencost_name(2) = 'north10_flux_vol', + gencost_outputlevel(2)=1, + mult_gencost(2) = 1., # -# gencost_avgperiod(3) = 'step', -# gencost_barfile(3) = 'm_trVol_step', -# gencost_mask(3) = 'north10_mask', -# gencost_name(3) = 'moc_north10', -# gencost_outputlevel(3)=1, -# mult_gencost(3) = 1., + gencost_avgperiod(3) = 'step', + gencost_barfile(3) = 'm_trVol_step', + gencost_mask(3) = 'north10_mask', + gencost_name(3) = 'moc_north10', + gencost_outputlevel(3)=1, + mult_gencost(3) = 1., +# + gencost_avgperiod(4) = 'step', + gencost_barfile(4) = 'm_boxmean_theta', + gencost_mask(4) = 'south30_mask', + gencost_name(4) = 'south30_densityfollowing_theta', + gencost_useDensityMask(4) = .TRUE., + gencost_refPressure(4) = 0.0, + gencost_sigmaLow(4) = 23.0, + gencost_sigmaHigh(4) = 27.0, + gencost_outputlevel(4)=1, + mult_gencost(4) = 1.D+07, # / # From 8a3912ae3301d87d4a135d3c55bea30a721af351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Fri, 29 Jul 2022 10:02:03 +0100 Subject: [PATCH 6/8] testing volume objective function --- global_oce_cs32/input_ad.sens/data.ecco | 33 ++++++------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 9c18b668..2a5137cd 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -7,37 +7,18 @@ # ECCO generic cost functions # *************************** &ECCO_GENCOST_NML +# gencost_avgperiod(1) = 'step', - gencost_barfile(1) = 'm_boxmean_theta', + gencost_barfile(1) = 'm_boxmean_vol', gencost_mask(1) = 'south30_mask', - gencost_name(1) = 'south30_mean_theta', + gencost_name(1) = 'south30_densityfollowing_vol', + gencost_useDensityMask(1) = .TRUE., + gencost_refPressure(1) = 0.0, + gencost_sigmaLow(1) = 24.0, + gencost_sigmaHigh(1) = 29.0, gencost_outputlevel(1)=1, mult_gencost(1) = 1.D+07, # - gencost_avgperiod(2) = 'step', - gencost_barfile(2) = 'm_horflux_vol', - gencost_mask(2) = 'north10_mask', - gencost_name(2) = 'north10_flux_vol', - gencost_outputlevel(2)=1, - mult_gencost(2) = 1., -# - gencost_avgperiod(3) = 'step', - gencost_barfile(3) = 'm_trVol_step', - gencost_mask(3) = 'north10_mask', - gencost_name(3) = 'moc_north10', - gencost_outputlevel(3)=1, - mult_gencost(3) = 1., -# - gencost_avgperiod(4) = 'step', - gencost_barfile(4) = 'm_boxmean_theta', - gencost_mask(4) = 'south30_mask', - gencost_name(4) = 'south30_densityfollowing_theta', - gencost_useDensityMask(4) = .TRUE., - gencost_refPressure(4) = 0.0, - gencost_sigmaLow(4) = 23.0, - gencost_sigmaHigh(4) = 27.0, - gencost_outputlevel(4)=1, - mult_gencost(4) = 1.D+07, # / # From 23f01aaedc3494239fdc4d4cd5c047e1c4a574dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=98Ciara?= Date: Fri, 29 Jul 2022 10:07:05 +0100 Subject: [PATCH 7/8] add back other gencost contributions --- global_oce_cs32/input_ad.sens/data.ecco | 33 ++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 2a5137cd..3f51a354 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -9,15 +9,36 @@ &ECCO_GENCOST_NML # gencost_avgperiod(1) = 'step', - gencost_barfile(1) = 'm_boxmean_vol', + gencost_barfile(1) = 'm_boxmean_theta', gencost_mask(1) = 'south30_mask', - gencost_name(1) = 'south30_densityfollowing_vol', - gencost_useDensityMask(1) = .TRUE., - gencost_refPressure(1) = 0.0, - gencost_sigmaLow(1) = 24.0, - gencost_sigmaHigh(1) = 29.0, + gencost_name(1) = 'south30_mean_theta', gencost_outputlevel(1)=1, mult_gencost(1) = 1.D+07, +# + gencost_avgperiod(2) = 'step', + gencost_barfile(2) = 'm_horflux_vol', + gencost_mask(2) = 'north10_mask', + gencost_name(2) = 'north10_flux_vol', + gencost_outputlevel(2)=1, + mult_gencost(2) = 1., +# + gencost_avgperiod(3) = 'step', + gencost_barfile(3) = 'm_trVol_step', + gencost_mask(3) = 'north10_mask', + gencost_name(3) = 'moc_north10', + gencost_outputlevel(3)=1, + mult_gencost(3) = 1., +# + gencost_avgperiod(4) = 'step', + gencost_barfile(4) = 'm_boxmean_vol', + gencost_mask(4) = 'south30_mask', + gencost_name(4) = 'south30_densityfollowing_vol', + gencost_useDensityMask(4) = .TRUE., + gencost_refPressure(4) = 0.0, + gencost_sigmaLow(4) = 24.0, + gencost_sigmaHigh(4) = 29.0, + gencost_outputlevel(4)=1, + mult_gencost(4) = 1.D+07, # # / From e0f3f09a52c852b19c04b522575afbaac658a371 Mon Sep 17 00:00:00 2001 From: Jean-Michel Campin Date: Tue, 27 Sep 2022 15:46:23 -0400 Subject: [PATCH 8/8] keep original namelist terminator --- global_oce_cs32/input_ad.sens/data.ecco | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/global_oce_cs32/input_ad.sens/data.ecco b/global_oce_cs32/input_ad.sens/data.ecco index 3f51a354..9394efd5 100644 --- a/global_oce_cs32/input_ad.sens/data.ecco +++ b/global_oce_cs32/input_ad.sens/data.ecco @@ -2,12 +2,12 @@ # ECCO cost functions # ******************* &ECCO_COST_NML - / + & + # *************************** # ECCO generic cost functions # *************************** &ECCO_GENCOST_NML -# gencost_avgperiod(1) = 'step', gencost_barfile(1) = 'm_boxmean_theta', gencost_mask(1) = 'south30_mask', @@ -40,6 +40,4 @@ gencost_outputlevel(4)=1, mult_gencost(4) = 1.D+07, # -# - / -# + &