From 51282fbf8fcc42a4c633d5d4e9235445030b7fe7 Mon Sep 17 00:00:00 2001 From: dougiesquire Date: Wed, 21 Aug 2024 21:20:53 +1000 Subject: [PATCH] Revert "use DT_THERM=6*DT and DIABATIC_FIRST = False - https://github.com/COSIMA/ACCESS-OM3/issues/138" This reverts commit 58e3b755e8e09664f4c8eedb40f428ce215a4bfb. --- MOM_input | 7 +++---- nuopc.runconfig | 2 +- nuopc.runseq | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/MOM_input b/MOM_input index eb81b60..510ea63 100644 --- a/MOM_input +++ b/MOM_input @@ -1,7 +1,7 @@ ! This file was written by the model and records the non-default parameters used at run-time. ! === module MOM === -DIABATIC_FIRST = False ! [Boolean] default = False +DIABATIC_FIRST = True ! [Boolean] default = False ! If true, apply diabatic and thermodynamic processes, including buoyancy ! forcing and mass gain or loss, before stepping the dynamics forward. USE_REGRIDDING = True ! [Boolean] default = False @@ -16,18 +16,17 @@ DT = 1800.0 ! [s] ! The (baroclinic) dynamics time step. The time-step that is actually used will ! be an integer fraction of the forcing time-step (DT_FORCING in ocean-only mode ! or the coupling timestep in coupled mode.) -DT_THERM = 10800.0 ! [s] default = 1800.0 +DT_THERM = 3600.0 ! [s] default = 1800.0 ! The thermodynamic and tracer advection time step. Ideally DT_THERM should be ! an integer multiple of DT and less than the forcing or coupling time-step, ! unless THERMO_SPANS_COUPLING is true, in which case DT_THERM can be an integer ! multiple of the coupling timestep. By default DT_THERM is set to DT. -THERMO_SPANS_COUPLING = True HFREEZE = 10.0 ! [m] default = -1.0 ! If HFREEZE > 0, melt potential will be computed. The actual depth over which ! melt potential is computed will be min(HFREEZE, OBLD), where OBLD is the ! boundary layer depth. If HFREEZE <= 0 (default), melt potential will not be ! computed. -DTBT_RESET_PERIOD = 10800.0 ! [s] default = 3600.0 +DTBT_RESET_PERIOD = 0.0 ! [s] default = 3600.0 ! The period between recalculations of DTBT (if DTBT <= 0). If DTBT_RESET_PERIOD ! is negative, DTBT is set based only on information available at ! initialization. If 0, DTBT will be set every dynamics time step. The default diff --git a/nuopc.runconfig b/nuopc.runconfig index 8c630c0..661ed75 100644 --- a/nuopc.runconfig +++ b/nuopc.runconfig @@ -286,7 +286,7 @@ CLOCK_attributes:: history_ymd = -999 ice_cpl_dt = 99999 #not used lnd_cpl_dt = 99999 #not used - ocn_cpl_dt = 1800 #ignored (coupling timestep set by nuopc.runseq) unless stop_option is nsteps + ocn_cpl_dt = 3600 #ignored (coupling timestep set by nuopc.runseq) unless stop_option is nsteps restart_n = 1 restart_option = nmonths restart_ymd = -999 diff --git a/nuopc.runseq b/nuopc.runseq index b41a742..1349281 100644 --- a/nuopc.runseq +++ b/nuopc.runseq @@ -1,5 +1,5 @@ runSeq:: -@1800 +@3600 MED med_phases_aofluxes_run MED med_phases_prep_ocn_accum MED med_phases_ocnalb_run