Merge branch 'dev-preindustrial+concentrations' into dougiesquire/pre…

…industrial+concentrations resolve merge conflicts
ACCESS-NRI · Dec 18, 2024 · c1af521 · c1af521
2 parents a3e2688 + 4c2543c
commit c1af521
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 31 deletions.
diff --git a/atmosphere/diagnostic_profiles/STASHC_detailed_concentrations b/atmosphere/diagnostic_profiles/STASHC_detailed_concentrations
@@ -1,5 +1,5 @@
  ### Start of user STASH requests for ATMOS ### 
- &STASHNUM NUM_REQ= 295, NUM_DOM=37,  NUM_TIM=20, NUM_USE=12 /   
+ &STASHNUM NUM_REQ= 299, NUM_DOM=37,  NUM_TIM=20, NUM_USE=12 /   
 
 # Monthly - 3D variables on model levels #
  &STREQ IMOD= 1, ISEC=0, ITEM=4, IDOM=2, ITIM=3, IUSE=2 /  
@@ -92,8 +92,7 @@
  &STREQ IMOD= 1, ISEC=5, ITEM=214, IDOM=1, ITIM=3, IUSE=2 /
  &STREQ IMOD= 1, ISEC=5, ITEM=215, IDOM=1, ITIM=3, IUSE=2 /
  &STREQ IMOD= 1, ISEC=5, ITEM=216, IDOM=1, ITIM=3, IUSE=2 /  
- &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=3, IUSE=2 /  
- &STREQ IMOD= 1, ISEC=3, ITEM=229, IDOM=1, ITIM=3, IUSE=2 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=3, IUSE=2 /   
  &STREQ IMOD= 1, ISEC=3, ITEM=296, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=3, ITEM=297, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=8, ITEM=208, IDOM=1, ITIM=3, IUSE=2 /  
@@ -291,6 +290,11 @@
  &STREQ IMOD= 1, ISEC=5, ITEM=216, IDOM=1, ITIM=1, IUSE=1 /  
  &STREQ IMOD= 1, ISEC=8, ITEM=209, IDOM=1, ITIM=1, IUSE=1 /  
  &STREQ IMOD= 1, ISEC=16, ITEM=222, IDOM=1, ITIM=1, IUSE=1 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=217, IDOM=1, ITIM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=1, IUSE=1 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=234, IDOM=1, ITIM=1, IUSE=1 / 
+ &STREQ IMOD= 1, ISEC=8, ITEM=234, IDOM=1, ITIM=1, IUSE=1 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=235, IDOM=1, ITIM=1 IUSE=1 /  
 
 # Daily - 2D variables above surface #
  &STREQ IMOD= 1, ISEC=2, ITEM=206, IDOM=1, ITIM=1, IUSE=1 /

diff --git a/atmosphere/diagnostic_profiles/STASHC_standard_concentrations b/atmosphere/diagnostic_profiles/STASHC_standard_concentrations
@@ -1,5 +1,5 @@
  ### Start of user STASH requests for ATMOS ### 
- &STASHNUM NUM_REQ= 242, NUM_DOM=37,  NUM_TIM=20, NUM_USE=12 /
+ &STASHNUM NUM_REQ= 246, NUM_DOM=37,  NUM_TIM=20, NUM_USE=12 /
 
  # Monthly - 3D variables on model levels #
  &STREQ IMOD= 1, ISEC=33, ITEM=1, IDOM=2, ITIM=3, IUSE=2 /  
@@ -55,7 +55,6 @@
  &STREQ IMOD= 1, ISEC=5, ITEM=215, IDOM=1, ITIM=3, IUSE=2 /
  &STREQ IMOD= 1, ISEC=5, ITEM=216, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=3, IUSE=2 /  
- &STREQ IMOD= 1, ISEC=3, ITEM=229, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=3, ITEM=296, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=3, ITEM=297, IDOM=1, ITIM=3, IUSE=2 /  
  &STREQ IMOD= 1, ISEC=8, ITEM=208, IDOM=1, ITIM=3, IUSE=2 /  
@@ -253,6 +252,11 @@
  &STREQ IMOD= 1, ISEC=5, ITEM=216, IDOM=1, ITIM=1, IUSE=1 /  
  &STREQ IMOD= 1, ISEC=8, ITEM=209, IDOM=1, ITIM=1, IUSE=1 /  
  &STREQ IMOD= 1, ISEC=16, ITEM=222, IDOM=1, ITIM=1, IUSE=1 /  
+ &STREQ IMOD= 1, ISEC=3, ITEM=217, IDOM=1, ITIM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=223, IDOM=1, ITIM=1, IUSE=1 /
+ &STREQ IMOD= 1, ISEC=3, ITEM=234, IDOM=1, ITIM=1, IUSE=1 / 
+ &STREQ IMOD= 1, ISEC=8, ITEM=234, IDOM=1, ITIM=1, IUSE=1 /  
+ &STREQ IMOD= 1, ISEC=8, ITEM=235, IDOM=1, ITIM=1 IUSE=1 /  
 
  # Daily - 2D non-surface #
  &STREQ IMOD= 1, ISEC=2, ITEM=206, IDOM=1, ITIM=1, IUSE=1 /

diff --git a/config.yaml b/config.yaml
@@ -19,13 +19,18 @@ laboratory: access-esm
 jobname: pre-industrial
 queue: normal
 walltime: 2:30:00
+jobfs: 1500MB
 
 # Modules for loading model executables
 modules:
   use:
       - /g/data/vk83/prerelease/modules
   load:
+<<<<<<< HEAD
       - access-esm1p6/pr26-4
+=======
+      - access-esm1p5/2024.05.1
+>>>>>>> dev-preindustrial+concentrations
 
 # Model configuration
 model: access

diff --git a/metadata.yaml b/metadata.yaml
@@ -24,5 +24,5 @@ nominal_resolution: 100 km
 reference: https://doi.org/10.1071/ES19035
 license: CC-BY-4.0
 model: ACCESS-ESM1.5
-version: ''
+version: '1.1'
 url: https://github.com/ACCESS-NRI/access-esm1.5-configs.git
diff --git a/ocean/diagnostic_profiles/diag_table_detailed b/ocean/diagnostic_profiles/diag_table_detailed
@@ -130,9 +130,6 @@ ACCESS-ESM_CMIP6
 "ocean-3d-sw_frac-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "sw_frac", "sw_frac", "ocean-3d-sw_frac-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
-"ocean-3d-temp_runoffmix-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
-"ocean_model", "temp_runoffmix", "temp_runoffmix", "ocean-3d-temp_runoffmix-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
-
 "ocean-3d-temp_rivermix-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "temp_rivermix", "temp_rivermix", "ocean-3d-temp_rivermix-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
@@ -400,9 +397,6 @@ ACCESS-ESM_CMIP6
 "ocean-2d-eta_t-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "eta_t", "eta_t", "ocean-2d-eta_t-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
-"ocean-2d-rhobarz-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
-"ocean_model", "rhobarz", "rhobarz", "ocean-2d-rhobarz-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
-
 "ocean-2d-conv_rho_ud_t-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "conv_rho_ud_t", "conv_rho_ud_t", "ocean-2d-conv_rho_ud_t-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 

diff --git a/ocean/diagnostic_profiles/diag_table_standard b/ocean/diagnostic_profiles/diag_table_standard
@@ -100,9 +100,6 @@ ACCESS-ESM_CMIP6
 "ocean-3d-sw_frac-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
 "ocean_model", "sw_frac", "sw_frac", "ocean-3d-sw_frac-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
-"ocean-3d-temp_runoffmix-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
-"ocean_model", "temp_runoffmix", "temp_runoffmix", "ocean-3d-temp_runoffmix-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
-
 "ocean-3d-temp_rivermix-1yearly-mean-ym%4yr%2mo", 1, "years", 1, "days", "time", 1, "years"
 "ocean_model", "temp_rivermix", "temp_rivermix", "ocean-3d-temp_rivermix-1yearly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
@@ -403,9 +400,6 @@ ACCESS-ESM_CMIP6
 "ocean-2d-eta_t-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "eta_t", "eta_t", "ocean-2d-eta_t-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 
-"ocean-2d-rhobarz-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
-"ocean_model", "rhobarz", "rhobarz", "ocean-2d-rhobarz-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
-
 "ocean-2d-conv_rho_ud_t-1monthly-mean-ym%4yr%2mo", 1, "months", 1, "days", "time", 1, "years"
 "ocean_model", "conv_rho_ud_t", "conv_rho_ud_t", "ocean-2d-conv_rho_ud_t-1monthly-mean-ym%4yr%2mo", "all", "average", "none", 2
 

diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_detailed_source.yaml
@@ -149,7 +149,6 @@ diag_table:
             tide_speed_drag:
             tide_speed_mask:
 
-
     'monthly 3d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -178,7 +177,6 @@ diag_table:
             age_global:
             sw_heat:
             sw_frac:
-            temp_runoffmix:
             temp_rivermix:
             temp_vdiffuse_impl:
             salt_vdiffuse_impl:
@@ -238,7 +236,6 @@ diag_table:
             fe:
             pprod_gross:
 
-
     'monthly 2d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -283,7 +280,6 @@ diag_table:
             wfiform:
             anompb:
             eta_t:
-            rhobarz:
             conv_rho_ud_t:
             bottom_temp:
             bottom_salt:
@@ -378,7 +374,7 @@ diag_table:
                     - output_freq_units
                 - file_name_date
         fields:
-            geolat_c: {reduction_method: 'snap'} # For some reason can't output _only_ gyre diags in a file
+            geolat_c: {reduction_method: 'snap'} # See https://github.com/ACCESS-NRI/access-esm1.5-configs/issues/74
             temp_merid_flux_advect_global:
             temp_merid_flux_over_global:
             temp_merid_flux_gyre_global:

diff --git a/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml b/ocean/diagnostic_profiles/source_yaml_files/diag_table_standard_source.yaml
@@ -149,7 +149,6 @@ diag_table:
             tide_speed_drag:
             tide_speed_mask:
 
-
     'yearly 3d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -168,7 +167,6 @@ diag_table:
             pot_rho_0:
             sw_heat:
             sw_frac:
-            temp_runoffmix:
             temp_rivermix:
             temp_tendency_expl:
             salt_tendency_expl:
@@ -200,7 +198,6 @@ diag_table:
             wt:
             wrhot:
 
-
     'monthly 3d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 3d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -226,7 +223,6 @@ diag_table:
             temp_vdiffuse_impl:
             salt_vdiffuse_impl:
 
-
     'monthly 3d BGC fields':
         defaults:  # these can be overridden for individual fields below
             module_name: generic_wombatlite
@@ -247,7 +243,6 @@ diag_table:
             fe:
             pprod_gross:
 
-
     'monthly 2d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 2d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -292,7 +287,6 @@ diag_table:
             wfiform:
             anompb:
             eta_t:
-            rhobarz:
             conv_rho_ud_t:
             bottom_temp:
             bottom_salt:
@@ -374,7 +368,6 @@ diag_table:
             surface_adic:
             surface_o2:
 
-
     'monthly 1d ocean fields':
         defaults:  # these can be overridden for individual fields below
             file_name_dimension: 1d  # descriptor for filename, e.g. 3d, 2d, scalar
@@ -388,7 +381,7 @@ diag_table:
                     - output_freq_units
                 - file_name_date
         fields:
-            geolat_c: {reduction_method: 'snap'} # For some reason can't output _only_ gyre diags in a file
+            geolat_c: {reduction_method: 'snap'} # See https://github.com/ACCESS-NRI/access-esm1.5-configs/issues/74
             temp_merid_flux_advect_global:
             temp_merid_flux_over_global:
             temp_merid_flux_gyre_global: