Skip to content

Commit

Permalink
MOM6: Adds new pre-defined coordinate WOA23INT
Browse files Browse the repository at this point in the history 
- NOAA-GFDL/MOM6@fee3281c2 Adds new pre-defined coordinate WOA23INT
- NOAA-GFDL/MOM6@da59eb0c7 Adds new pre-defined coordinate WOA09INT
- NOAA-GFDL/MOM6@0344a7637 Add gustless Tau to fluxes extracted from IOB by FMS cap. - Gustless Tau is needed for Langmuir turbulence parameterization (part of ePBL) in non-Boussinesq mode. - Adds new option to populate Gustless Tau field when present in fluxes control structure as part of extract_IOB_stresses, which is used in convert_IOB_to_fluxes in the FMS cap.
- NOAA-GFDL/MOM6@87a0c6187 Removes remap_via_sub_cells(), after copying code into remapping_core_h()
  • Loading branch information
@mom6bot
mom6bot committed Aug 2, 2024
1 parent 5bbcb80 commit 31a3475
Show file tree
Hide file tree
Showing 73 changed files with 233 additions and 1 deletion.
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/AM2_SIS2_MOM6i_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Concurrent_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
2 changes: 2 additions & 0 deletions coupled_AM2_LM3_SIS2/Intersperse_ice_1deg/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -662,6 +662,8 @@ DIAG_COORD_DEF_Z = "FILE:OM3_zgrid.nc,interfaces=zw" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,8 @@ DIAG_COORD_DEF_Z = "FILE:OM3_zgrid.nc,interfaces=zw" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -706,6 +708,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
2 changes: 2 additions & 0 deletions ice_ocean_SIS2/Baltic_ALE_z_offline_tracers/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ ALE_COORDINATE_CONFIG = "FILE:vgrid.nc,dz" ! default = "UNIFORM"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -756,6 +758,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -786,6 +790,8 @@ DIAG_COORD_DEF_RHO2 = "FILE:diag_rho2.nc,interfaces=rho2" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_025/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -298,6 +300,8 @@ DIAG_COORD_DEF_RHO2 = "FILE:diag_rho2.nc,interfaces=rho2" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -756,6 +758,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -786,6 +790,8 @@ DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/Baltic_OM4_05/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -294,6 +296,8 @@ DIAG_COORD_DEF_RHO2 = "RFNC1:35,999.5,1028,1028.5,8.,1038.,0.0078125" ! default
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
6 changes: 6 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.all
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -756,6 +758,8 @@ DIAG_COORD_DEF_Z = "WOA09" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -786,6 +790,8 @@ DIAG_COORD_DEF_RHO2 = "FILE:diag_rho2.nc,interfaces=rho2" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
4 changes: 4 additions & 0 deletions ice_ocean_SIS2/OM4_025/MOM_parameter_doc.short
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,8 @@ ALE_COORDINATE_CONFIG = "HYBRID:hycom1_75_800m.nc,sigma2,FNC1:2,4000,4.5,.01" !
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down Expand Up @@ -305,6 +307,8 @@ DIAG_COORD_DEF_RHO2 = "FILE:diag_rho2.nc,interfaces=rho2" ! default = "WOA09"
! by a comma or space, e.g. FILE:lev.nc,dz
! or FILE:lev.nc,interfaces=zw
! WOA09[:N] - the WOA09 vertical grid (approximately)
! WOA09INT[:N] - layers spanned by the WOA09 depths
! WOA23INT[:N] - layers spanned by the WOA23 depths
! FNC1:string - FNC1:dz_min,H_total,power,precision
! HYBRID:string - read from a file. The string specifies
! the filename and two variable names, separated
Expand Down
Loading

0 comments on commit 31a3475

Please sign in to comment.