diff --git a/.github/workflows/mom6_cobalt_1D.yaml b/.github/workflows/mom6_cobalt_1D.yaml index 19887483f..d9f971716 100644 --- a/.github/workflows/mom6_cobalt_1D.yaml +++ b/.github/workflows/mom6_cobalt_1D.yaml @@ -28,9 +28,8 @@ jobs: - name: Build mom6-sis2-cobalt working-directory: ./builds run: | - apt update; apt install -y wget echo "build mom6-sis2-cobalt ..." - ./linux-build.bash -m docker -p linux-gnu -t debug -f mom6sis2 + ./linux-build.bash -m docker -p linux-gnu -t debug -f mom6sis2_yaml - name: Download 1d model dataset working-directory: ./exps @@ -42,6 +41,11 @@ jobs: run: | ./driver.sh + - name: Run mppnccombine to combine sub-region diag outputs + working-directory: ./exps/OM4.single_column.COBALT + run: | + /opt/bin/mppnccombine -64 -h 16384 -m -k 100 20040102.ocean_daily_subset.nc 20040102.ocean_daily_subset.nc.00* + - name: Check ref working-directory: ./exps/OM4.single_column.COBALT run: | diff --git a/.gitmodules b/.gitmodules index d6346ac90..fba4109c9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,14 +30,14 @@ path = src/libyaml url = https://github.com/yaml/libyaml.git branch = master -[submodule "src/MOM6"] - path = src/MOM6 - url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git - branch = dev/cefi [submodule "src/FMS"] path = src/FMS url = https://github.com/NOAA-GFDL/FMS.git branch = 2024.01.02 +[submodule "src/MOM6"] + path = src/MOM6 + url = https://github.com/NOAA-CEFI-Regional-Ocean-Modeling/MOM6.git + branch = dev/cefi [submodule "src/coupler"] path = src/coupler url = https://github.com/NOAA-GFDL/FMScoupler.git diff --git a/builds/linux-build.bash b/builds/linux-build.bash index dd4920925..c3c4a02c3 100755 --- a/builds/linux-build.bash +++ b/builds/linux-build.bash @@ -102,6 +102,56 @@ fi make $makeflags MOM6SIS2 +elif [[ $flavor == "mom6sis2_yaml" ]]; then + + echo "build mom6sis2 with FMS2 cap and yaml" + +[[ -d build/$machine_name-$platform/libyaml/$target ]] && rm -rf build/$machine_name-$platform/libyaml/$target +mkdir -p build/$machine_name-$platform/libyaml/$target +pushd $srcdir/libyaml +$srcdir/libyaml/bootstrap +$srcdir/libyaml/configure --prefix=$abs_rootdir/build/$machine_name-$platform/libyaml/$target +make +make install + +if [ $? -ne 0 ]; then + echo "Could not build the libyaml library!" + exit 1 +fi +popd + +mkdir -p build/$machine_name-$platform/shared/$target +pushd build/$machine_name-$platform/shared/$target +rm -f path_names +$srcdir/mkmf/bin/list_paths $srcdir/FMS/{affinity,amip_interp,column_diagnostics,diag_integral,drifters,horiz_interp,memutils,sat_vapor_pres,topography,astronomy,constants,diag_manager,field_manager,include,monin_obukhov,platform,tracer_manager,axis_utils,coupler,fms,fms2_io,interpolator,mosaic,mosaic2,random_numbers,time_interp,tridiagonal,block_control,data_override,exchange,mpp,time_manager,string_utils,parser}/ $srcdir/FMS/libFMS.F90 +$srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -o "-I../../libyaml/$target/include" -p libfms.a -l "-L../../libyaml/$target/lib -lyaml $linker_options" -c "-Duse_libMPI -Duse_yaml -Duse_netCDF -DMAXFIELDMETHODS_=800" path_names + +make $makeflags libfms.a + +if [ $? -ne 0 ]; then + echo "Could not build the FMS library!" + exit 1 +fi + +popd + + mkdir -p build/$machine_name-$platform/ocean_ice/$target + pushd build/$machine_name-$platform/ocean_ice/$target + rm -f path_names + $srcdir/mkmf/bin/list_paths $srcdir/MOM6/{config_src/infra/FMS2,config_src/memory/dynamic_symmetric,config_src/drivers/FMS_cap,config_src/external/ODA_hooks,config_src/external/database_comms,config_src/external/drifters,config_src/external/stochastic_physics,pkg/GSW-Fortran/{modules,toolbox}/,src/{*,*/*}/} $srcdir/SIS2/{config_src/dynamic_symmetric,config_src/external/Icepack_interfaces,src} $srcdir/icebergs/src $srcdir/FMS/{coupler,include}/ $srcdir/{ocean_BGC/generic_tracers,ocean_BGC/mocsy/src}/ $srcdir/{atmos_null,ice_param,land_null,coupler/shared/,coupler/full/}/ + + +compiler_options='-DINTERNAL_FILE_NML -DUSE_FMS2_IO -Duse_yaml -DMAX_FIELDS_=600 -DNOT_SET_AFFINITY -D_USE_MOM6_DIAG -D_USE_GENERIC_TRACER -DUSE_PRECISION=2 -D_USE_LEGACY_LAND_ -Duse_AM3_physics' +linker_options='' +if [[ "$target" =~ "stdpar" ]] ; then + compiler_options="$compiler_options -stdpar -Minfo=accel" + linker_options="$linker_options -stdpar " +fi + + $srcdir/mkmf/bin/mkmf -t $abs_rootdir/$machine_name/$platform.mk -o "-I../../shared/$target -I../../libyaml/$target/include" -p MOM6SIS2 -l "-L../../shared/$target -lfms -L../../libyaml/$target/lib -lyaml $linker_options" -c "$compiler_options" path_names + + make $makeflags MOM6SIS2 + elif [[ $flavor == "fms1_mom6sis2" ]]; then echo "build mom6sis2 with FMS1 cap" diff --git a/docs/source/InputsOutputs.rst b/docs/source/InputsOutputs.rst index 052a46b45..68315facd 100644 --- a/docs/source/InputsOutputs.rst +++ b/docs/source/InputsOutputs.rst @@ -186,6 +186,8 @@ Model output is controlled via the FMS diag_manager using the ``diag_table``. The diag_table file has three kinds of section: Title, File and Field. The title section is mandatory and always the first. There can be multiple file and field sections typically either in pairs or grouped in to all files and all fields, but always with the file section preceding the corresponding field section. +The new FMS2 comes with a new rewritten diag manager. The old diag_manager code has been kept intact and will be used by default. The rewritten diag manager can be enabled via ``use_modern_diag = .true.`` to your ``diag_manager_nml``. Keep in mind that the rewritten diag manager only supports the YAML format of diag_Table (this requires the additional third-party libyaml when building FMS2). Users can refer to `this page `__ for more details of the diag_table yaml format. An example diag_table.yaml can be found in our 1D case: ``exps/OM4.single_column.COBALT/diag_table.yaml``. + .. _TitleSec: --------------------------- diff --git a/exps/OM4.single_column.COBALT/diag_table.yaml b/exps/OM4.single_column.COBALT/diag_table.yaml new file mode 100644 index 000000000..1a04eb05e --- /dev/null +++ b/exps/OM4.single_column.COBALT/diag_table.yaml @@ -0,0 +1,21 @@ +title: test_diag_manager +base_date: 1993 1 1 0 0 0 +diag_files: +- file_name: ocean_daily_subset + time_units: days + unlimdim: time + is_ocean: true + freq: 1 days + varlist: + - module: ocean_model + var_name: thetao + reduction: average + kind: r4 + sub_region: + - grid_type: index + tile: 1 + corner1: 2,2 + corner2: 3,2 + corner3: 2,3 + corner4: 3,3 + diff --git a/exps/OM4.single_column.COBALT/driver.sh b/exps/OM4.single_column.COBALT/driver.sh index 501a8e850..30ce66141 100755 --- a/exps/OM4.single_column.COBALT/driver.sh +++ b/exps/OM4.single_column.COBALT/driver.sh @@ -1,6 +1,7 @@ #!/bin/bash # +export LD_LIBRARY_PATH=../../builds/build/docker-linux-gnu/libyaml/debug/lib:$LD_LIBRARY_PATH rm -rf RESTART* # @@ -11,6 +12,7 @@ echo "run 48hrs test ..." ln -fs input.nml_48hr input.nml mpirun --allow-run-as-root -np 1 ../../builds/build/docker-linux-gnu/ocean_ice/debug/MOM6SIS2 > out1 2>err1 tail out1 +tail err1 mv RESTART RESTART_48hrs mv ocean.stats* RESTART_48hrs @@ -19,6 +21,7 @@ echo "run 24hrs test ..." ln -fs input.nml_24hr input.nml mpirun --allow-run-as-root -np 1 ../../builds/build/docker-linux-gnu/ocean_ice/debug/MOM6SIS2 > out2 2>err2 tail out2 +tail err2 mv RESTART RESTART_24hrs mv ocean.stats* RESTART_24hrs @@ -33,8 +36,10 @@ echo "run 24hrs rst test ..." ln -fs input.nml_24hr_rst input.nml mpirun --allow-run-as-root -np 1 ../../builds/build/docker-linux-gnu/ocean_ice/debug/MOM6SIS2 > out3 2>err3 tail out3 +tail err3 mv RESTART RESTART_24hrs_rst mv ocean.stats* RESTART_24hrs_rst +[[ ! -f 20040102.ocean_daily_subset.nc.0000 ]] && echo "Can not find sub-region diag output! Exit!" && exit 1 # Define the directories containing the files DIR1="RESTART_24hrs_rst/" diff --git a/exps/OM4.single_column.COBALT/input.nml_24hr_rst b/exps/OM4.single_column.COBALT/input.nml_24hr_rst index c3b9f0a4c..0deeb82f2 100644 --- a/exps/OM4.single_column.COBALT/input.nml_24hr_rst +++ b/exps/OM4.single_column.COBALT/input.nml_24hr_rst @@ -57,6 +57,7 @@ max_input_fields = 2000 max_output_fields = 5000 mix_snapshot_average_fields=.false. + use_modern_diag=.true. / &flux_exchange_nml diff --git a/src/MOM6 b/src/MOM6 index e541d2205..e318b4e05 160000 --- a/src/MOM6 +++ b/src/MOM6 @@ -1 +1 @@ -Subproject commit e541d2205f1d43361be3f24b994834494a7fe984 +Subproject commit e318b4e05835551c57a6b249cae6308657367145 diff --git a/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml new file mode 100644 index 000000000..3aba94be2 --- /dev/null +++ b/xmls/NWA12/CEFI_NWA12_cobalt_fms2_yaml.xml @@ -0,0 +1,1065 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Make the executable for ocean-ice experiments. + Uses FMS2 + + + + FMS.git + + + -Duse_yaml -Duse_libMPI -Duse_netCDF $(F2003_FLAGS) -DMAXFIELDMETHODS_=600 + + + + + + CEFI-regional-MOM6.git + + + + + + + + + + + ice_param.git + + + + + + + + + + land_null.git + + + + + + atmos_null.git + + + $(F2003_FLAGS) + + + + + + + coupler.git + + + + + + + + + + + + + months = $months + days = $days + current_date = 1993,1,1,0,0,0 + hours = 0 + minutes = 0 + seconds = 0 + calendar = 'gregorian' + dt_cpld = 3600 + dt_atmos = 3600 + do_atmos = .false. + do_land = .false. + do_ice = .true. + do_ocean = .true. + atmos_npes = 0, + ocean_npes = 0, + concurrent = .false. + use_lag_fluxes=.false. + atmos_nthreads = $atm_threads + ocean_nthreads = $ocn_threads + do_chksum = .false. + do_endpoint_chksum = .false. + + + parameter_filename = 'INPUT/COBALT_input','INPUT/COBALT_override' + + + do_generic_tracer=.true. + do_generic_abiotic=.false. + do_generic_CFC=.false. + do_generic_COBALT=.true. + do_generic_age=.false. + do_generic_SF6=.false. + force_update_fluxes=.true. + as_param='W14' + do_vertfill_post=.true. + + + max_fields = 400 + + + co2_calc='mocsy' + + + co2_calc = 'mocsy' + debug = .false. + imbalance_tolerance=1.0e-9 + + + max_files = 600 + flush_nc_files=.false. + max_axes = 600 + max_num_axis_sets = 600 + max_input_fields = 2000 + max_output_fields = 5000 + mix_snapshot_average_fields=.false. + use_modern_diag=.true. + + + make_exchange_reproduce = .false. + interp_method = 'second_order' + + + clock_grain='ROUTINE' + clock_flags='NONE' + domains_stack_size = 8000000 + stack_size =0 + + + fms_netcdf_restart=.true. + threading_read='multi' + max_files_r = 800 + max_files_w = 800 + checksum_required=.false. + + + layout= 1,1 + + + + construct_table_wrt_liq = .true. + construct_table_wrt_liq_and_ice = .true. + + + t_range = 10. + + + verbose=.false. + verbose_hrs=24 + traj_sample_hrs=24 + debug=.false. + really_debug=.false. + use_slow_find=.true. + add_weight_to_ocean=.true. + passive_mode=.false. + generate_test_icebergs=.false. + speed_limit=0. + use_roundoff_fix=.true. + make_calving_reproduce=.true. + + + neutral = .true. + + + ocean_albedo_option = 2 + + + rough_scheme = 'beljaars' + + + ncar_ocean_flux_multilevel = .true. + bulk_zu = 10.0 + bulk_zt = 2.0 + bulk_zq = 2.0 + raoult_sat_vap = .true. + + + + + + + + + + +"ATM", "p_surf", "msl", "INPUT/ERA5_msl_${fyear}_padded.nc", "bilinear", 1.0 +"ATM", "p_bot", "msl", "INPUT/ERA5_msl_${fyear}_padded.nc", "bilinear", 1.0 +"ATM", "t_bot", "t2m", "INPUT/ERA5_t2m_${fyear}_padded.nc", "bilinear", 1.0 +"ATM", "sphum_bot", "sphum", "INPUT/ERA5_sphum_${fyear}_padded.nc", "bilinear", 1.0 +"ATM", "u_bot", "u10", "INPUT/ERA5_u10_${fyear}_padded.nc", "bicubic", 1.0 +"ATM", "v_bot", "v10", "INPUT/ERA5_v10_${fyear}_padded.nc", "bicubic", 1.0 +"ATM", "z_bot", "", "", "bilinear", 10.0 +"ATM", "gust", "", "", "bilinear", 1.0e-4 +"ATM", "o2_flux_pcair_atm", "", "", "none", 0.214 +"ATM", "co2_flux_pcair_atm", "mole_fraction_of_carbon_dioxide_in_air", "INPUT/mole_fraction_of_co2_extended_ssp245.nc", "bilinear", 1.0e-06 +"ATM", "co2_bot", "mole_fraction_of_carbon_dioxide_in_air", "INPUT/mole_fraction_of_co2_extended_ssp245.nc", "bilinear", 1.0e-06 +"ATM", "co2_dvmr_restore", "mole_fraction_of_carbon_dioxide_in_air", "INPUT/mole_fraction_of_co2_extended_ssp245.nc", "bilinear", 1.0e-06 +# +"ICE", "lw_flux_dn" , "strd", "INPUT/ERA5_strd_${fyear}_padded.nc", "bilinear", 2.77778e-4 +"ICE", "sw_flux_vis_dir_dn", "ssrd", "INPUT/ERA5_ssrd_${fyear}_padded.nc", "bilinear", 7.9167e-5 +"ICE", "sw_flux_vis_dif_dn", "ssrd", "INPUT/ERA5_ssrd_${fyear}_padded.nc", "bilinear", 7.9167e-5 +"ICE", "sw_flux_nir_dir_dn", "ssrd", "INPUT/ERA5_ssrd_${fyear}_padded.nc", "bilinear", 5.9722e-5 +"ICE", "sw_flux_nir_dif_dn", "ssrd", "INPUT/ERA5_ssrd_${fyear}_padded.nc", "bilinear", 5.9722e-5 +"ICE", "lprec", "lp", "INPUT/ERA5_lp_${fyear}_padded.nc", "bilinear", 0.277777778 +"ICE", "fprec", "sf", "INPUT/ERA5_sf_${fyear}_padded.nc", "bilinear", 0.277777778 +"ICE", "runoff", "runoff", "INPUT/glofas_runoff_${fyear}.nc", "none", 1.0 +"ICE", "calving", "", "", "none", 0.0 +"ICE", "dhdt", "", "", "none", 80.0 +"ICE", "dedt", "", "", "none", 2.0e-6 +"ICE", "drdt", "", "", "none", 10.0 +# +"LND", "t_surf", "", "", "none", 273.0 +"LND", "t_ca", "", "", "none", 273.0 +"LND", "q_ca", "", "", "none", 0.0 +"LND", "rough_mom", "", "", "none", 0.01 +"LND", "rough_heat", "", "", "none", 0.1 +"LND", "albedo", "", "", "none", 0.1 +"LND", "sphum_surf", "", "", "none", 0.0 +"LND", "sphum_ca", "", "", "none", 0.0 +"LND", "t_flux", "", "", "none", 0.0 +"LND", "sphum_flux", "", "", "none", 0.0 +"LND", "lw_flux", "", "", "none", 0.0 +"LND", "sw_flux", "", "", "none", 0.0 +"LND", "lprec", "", "", "none", 0.0 +"LND", "fprec", "", "", "none", 0.0 +"LND", "dhdt", "", "", "none", 5.0 +"LND", "dedt", "", "", "none", 2.0e-6 +"LND", "dedq", "", "", "none", 0.0 +"LND", "drdt", "", "", "none", 5.0 +"LND", "drag_q", "", "", "none", 0.0 +"LND", "p_surf", "", "", "none", 1.0e5 +# +"OCN", "runoff_no3_flux_ice_ocn", "NO3_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_ldon_flux_ice_ocn", "LDON_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_sldon_flux_ice_ocn", "SLDON_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_srdon_flux_ice_ocn", "SRDON_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_ndet_flux_ice_ocn", "NDET_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_po4_flux_ice_ocn", "PO4_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_ldop_flux_ice_ocn", "LDOP_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_sldop_flux_ice_ocn", "SLDOP_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_srdop_flux_ice_ocn", "SRDOP_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_pdet_flux_ice_ocn", "PDET_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_fed_flux_ice_ocn", "FED_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_alk_flux_ice_ocn", "ALK_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_dic_flux_ice_ocn", "DIC_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_nh4_flux_ice_ocn", "NH4_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_fedet_flux_ice_ocn", "FEDET_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_o2_flux_ice_ocn", "O2_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_sio4_flux_ice_ocn", "SI_CONC", "./INPUT/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc", "none", 1.0e-3 +"OCN", "runoff_lith_flux_ice_ocn", "", "", "none", 13.0e-3 +"OCN", "dry_dep_fed_flux_ice_ocn", "dryfe", "./INPUT/esm4_dryfe_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "wet_dep_fed_flux_ice_ocn", "wetfe", "./INPUT/esm4_wetfe_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "dry_dep_lith_flux_ice_ocn", "drydust", "./INPUT/esm4_drydust_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "wet_dep_lith_flux_ice_ocn", "wetdust", "./INPUT/esm4_wetdust_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "dry_dep_po4_flux_ice_ocn", "drydust", "./INPUT/esm4_drydust_climo_1993-2014.nc", "bilinear", -4.0e-6 +"OCN", "wet_dep_no3_flux_ice_ocn", "wetnoy", "./INPUT/esm4_wetnoy_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "dry_dep_no3_flux_ice_ocn", "drynoy", "./INPUT/esm4_drynoy_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "wet_dep_nh4_flux_ice_ocn", "wetnh4", "./INPUT/esm4_wetnh4_climo_1993-2014.nc", "bilinear", -1.0 +"OCN", "dry_dep_nh4_flux_ice_ocn", "drynh4", "./INPUT/esm4_drynh4_climo_1993-2014.nc", "bilinear", -1.0 + + + +# specific humidity for moist runs +"TRACER", "atmos_mod", "sphum" + "longname", "specific humidity" + "units", "kg/kg" / +# prognostic cloud scheme tracers +"TRACER", "atmos_mod", "liq_wat" + "longname", "cloud liquid specific humidity" + "units", "kg/kg" / +"TRACER", "atmos_mod", "ice_wat" + "longname", "cloud ice water specific humidity" + "units", "kg/kg" / +"TRACER", "atmos_mod", "cld_amt" + "longname", "cloud fraction" + "units", "none" / +# sphum must be present on land as well +"TRACER", "land_mod", "sphum" + "longname", "specific humidity" + "units", "kg/kg" / +###................................................. + +"namelists","ocean_mod","generic_COBALT" +enforce_src_info = f +alk_obc_src_file_name = bgc_esper_1993_2022.nc +alk_obc_lfac_in = 0.03 +alk_obc_lfac_out = 1.0 +cadet_arag_obc_src_file_name = bgc_cobalt.nc +cadet_arag_obc_lfac_in = 0.03 +cadet_ararg_obc_lfac_out = 1.0 +cadet_calc_obc_src_file_name = bgc_cobalt.nc +cadet_calc_obc_lfac_in = 0.03 +cadet_calc_obc_lfac_out = 1.0 +dic_obc_src_file_name = bgc_esper_1993_2022.nc +dic_obc_lfac_in = 0.03 +dic_obc_lfac_out = 1.0 +dic14_obc_src_file_name = bgc_zero.nc +dic14_obc_lfac_in = 0.03 +dic14_obc_lfac_out = 1.0 +do14_obc_src_file_name = bgc_zero.nc +do14_obc_lfac_in = 0.03 +do14_obc_lfac_out = 1.0 +do14c_obc_src_file_name = bgc_zero.nc +do14c_obc_lfac_in = 0.03 +do14c_obc_lfac_out = 1.0 +di14c_obc_src_file_name = bgc_zero.nc +di14c_obc_lfac_in = 0.03 +di14c_obc_lfac_out = 1.0 +fed_obc_src_file_name = bgc_cobalt.nc +fed_obc_lfac_in = 0.03 +fed_obc_lfac_out = 1.0 +fedi_obc_src_file_name = bgc_cobalt.nc +fedi_obc_lfac_in = 0.03 +fedi_obc_lfac_out = 1.0 +felg_obc_src_file_name = bgc_cobalt.nc +felg_obc_lfac_in = 0.03 +felg_obc_lfac_out = 1.0 +fedet_obc_src_file_name = bgc_cobalt.nc +fedet_obc_lfac_in = 0.03 +fedet_obc_lfac_out = 1.0 +fesm_obc_src_file_name = bgc_cobalt.nc +fesm_obc_lfac_in = 0.03 +fesm_obc_lfac_out = 1.0 +ldon_obc_src_file_name = bgc_cobalt.nc +ldon_obc_lfac_in = 0.03 +ldon_obc_lfac_out = 1.0 +ldop_obc_src_file_name = bgc_cobalt.nc +ldop_obc_lfac_in = 0.03 +ldop_obc_lfac_out = 1.0 +lith_obc_src_file_name = bgc_cobalt.nc +lith_obc_lfac_in = 0.03 +lith_obc_lfac_out = 1.0 +lithdet_obc_src_file_name = bgc_cobalt.nc +lithdet_obc_lfac_in = 0.03 +lithdet_obc_lfac_out = 1.0 +nbact_obc_src_file_name = bgc_cobalt.nc +nbact_obc_lfac_in = 0.03 +nbact_obc_lfac_out = 1.0 +ndet_obc_src_file_name = bgc_cobalt.nc +ndet_obc_lfac_in = 0.03 +ndet_obc_lfac_out = 1.0 +ndi_obc_src_file_name = bgc_cobalt.nc +ndi_obc_lfac_in = 0.03 +ndi_obc_lfac_out = 1.0 +nlg_obc_src_file_name = bgc_cobalt.nc +nlg_obc_lfac_in = 0.03 +nlg_obc_lfac_out = 1.0 +nsm_obc_src_file_name = bgc_cobalt.nc +nsm_obc_lfac_in = 0.03 +nsm_obc_lfac_out = 1.0 +nh3_obc_src_file_name = bgc_zero.nc +nh3_obc_lfac_in = 0.03 +nh3_obc_lfac_out = 1.0 +nh4_obc_src_file_name = bgc_cobalt.nc +nh4_obc_lfac_in = 0.03 +nh4_obc_lfac_out = 1.0 +no3_obc_src_file_name = bgc_woa.nc +no3_obc_lfac_in = 0.03 +no3_obc_lfac_out = 1.0 +o2_obc_src_file_name = bgc_woa.nc +o2_obc_lfac_in = 0.03 +o2_obc_lfac_out = 1.0 +pdet_obc_src_file_name = bgc_cobalt.nc +pdet_obc_lfac_in = 0.03 +pdet_obc_lfac_out = 1.0 +po4_obc_src_file_name = bgc_woa.nc +po4_obc_lfac_in = 0.03 +po4_obc_lfac_out = 1.0 +srdon_obc_src_file_name = bgc_cobalt.nc +srdon_obc_lfac_in = 0.03 +srdon_obc_lfac_out = 1.0 +srdop_obc_src_file_name = bgc_cobalt.nc +srdop_obc_lfac_in = 0.03 +srdop_obc_lfac_out = 1.0 +sldon_obc_src_file_name = bgc_cobalt.nc +sldon_obc_lfac_in = 0.03 +sldon_obc_lfac_out = 1.0 +sldop_obc_src_file_name = bgc_cobalt.nc +sldop_obc_lfac_in = 0.03 +sldop_obc_lfac_out = 1.0 +sidet_obc_src_file_name = bgc_cobalt.nc +sidet_obc_lfac_in = 0.03 +sidet_obc_lfac_out = 1.0 +silg_obc_src_file_name = bgc_cobalt.nc +silg_obc_lfac_in = 0.03 +silg_obc_lfac_out = 1.0 +sio4_obc_src_file_name = bgc_woa.nc +sio4_obc_lfac_in = 0.03 +sio4_obc_lfac_out = 1.0 +nsmz_obc_src_file_name = bgc_cobalt.nc +nsmz_obc_lfac_in = 0.03 +nsmz_obc_lfac_out = 1.0 +nmdz_obc_src_file_name = bgc_cobalt.nc +nmdz_obc_lfac_in = 0.03 +nmdz_obc_lfac_out = 1.0 +nlgz_obc_src_file_name = bgc_cobalt.nc +nlgz_obc_lfac_in = 0.03 +nlgz_obc_lfac_out = 1.0 +nmdp_obc_src_file_name = bgc_cobalt.nc +nmdp_obc_lfac_in = 0.03 +nmdp_obc_lfac_out = 1.0 +femdp_obc_src_file_name = bgc_cobalt.nc +femdp_obc_lfac_in = 0.03 +femdp_obc_lfac_out = 1.0 +femd_obc_src_file_name = bgc_cobalt.nc +femd_obc_lfac_in = 0.03 +femd_obc_lfac_out = 1.0 +simd_obc_src_file_name = bgc_cobalt.nc +simd_obc_lfac_in = 0.03 +simd_obc_lfac_out = 1.0 +pdi_obc_src_file_name = bgc_cobalt.nc +pdi_obc_lfac_in = 0.03 +pdi_obc_lfac_out = 1.0 +psm_obc_src_file_name = bgc_cobalt.nc +psm_obc_lfac_in = 0.03 +psm_obc_lfac_out = 1.0 +pmd_obc_src_file_name = bgc_cobalt.nc +pmd_obc_lfac_in = 0.03 +pmd_obc_lfac_out = 1.0 +nmd_obc_src_file_name = bgc_cobalt.nc +nmd_obc_lfac_in = 0.03 +nmd_obc_lfac_out = 1.0 +plg_obc_src_file_name = bgc_cobalt.nc +plg_obc_lfac_in = 0.03 +plg_obc_lfac_out = 1.0 +/ + + +$name +$baseDate + + + ./diag_tables/diag_table_COBALT_2023-04 + ./diag_tables/diag_table_MOM6_2023-03 + ./diag_tables/diag_table.SIS + ./diag_tables/diag_table_COBALT_neus + ./diag_tables/diag_table_MOM6_neus + /home/Andrew.C.Ross/git/nwa-xml/diag_tables/diag_table_COBALT_2023-04 + /home/Andrew.C.Ross/git/nwa-xml/diag_tables/diag_table_MOM6_2023-03 + /home/Andrew.C.Ross/git/nwa-xml/diag_tables/diag_table.SIS + /home/Andrew.C.Ross/git/nwa-xml/diag_tables/diag_table_COBALT_neus + /home/Andrew.C.Ross/git/nwa-xml/diag_tables/diag_table_MOM6_neus + + + $(NWA12_WORLD)/restarts/NWA12_COBALT_2023_10_spinup/NWA12_COBALT_2023_10_spinup_2003.nc + $(NWA12_WORLD)/glorys/glorys_ic_1993-01-01.nc + + + $(NWA12_WORLD)/restarts/NWA12_COBALT_2023_10_spinup/NWA12_COBALT_2023_10_spinup_2003.nc + $(NWA12_WORLD)/glorys/glorys_ic_1993-01-01.nc + + + $work/INPUT/MOM_override << MOM_OVERRIDE_EOF +#override USE_generic_tracer = True +#override MAX_FIELDS=500 +#override OBC_TIDE_NODAL_REF_DATE = ${fyear},7,2 +!#override DT_OBC_SEG_UPDATE_OBGC = 3600 +#override CHL_FROM_FILE = False +#override DO_GEOTHERMAL = True +#override GENERIC_TRACER_IC_FILE = "NWA12_COBALT_2023_10_spinup_2003.nc" +#override EPBL_ANSWER_DATE = 20231231 +#override MLD_ITERATION_GUESS = False +#override REMAP_AUXILIARY_VARS = True +#override DIABATIC_FIRST = False +#override EQN_OF_STATE = "WRIGHT_FULL" +#override DT_THERM = 1200.0 +#override DT = 400 +MOM_OVERRIDE_EOF + +truncate -s 0 $work/INPUT/COBALT_override +cat > $work/INPUT/COBALT_override << COBALT_OVERRIDE_EOF +! Put the contents of your COBALT_override file here. +! For parameters which are not specified in the COBALT_input file, just set the new value, ex: +! do_case2_mod = True +! For parameters which are specified in the COBALT_input file, specify an override, ex: +!#override do_case2_mod = True +COBALT_OVERRIDE_EOF + +truncate -s 0 $work/INPUT/COBALT_input +cat > $work/INPUT/COBALT_input << COBALT_INPUT_EOF +! Put the contents of your COBALT_input file here +do_case2_mod = True +COBALT_INPUT_EOF + +#hack to test yaml diag_table, convert the diag_table to yaml format +diag-table-to-yaml -f $work/diag_table -o $work/diag_table.yaml + ]]> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + > $HOME/frejobs_stdout < $work/INPUT/MOM_layout << MOM_LAYOUT_EOF +#override IO_LAYOUT = $ocn_io_layout +#override LAYOUT = $ocn_layout +#override MASKTABLE = $ocn_mask_table +#override OCEAN_OMP_THREADS = $ocn_threads +MOM_LAYOUT_EOF + +cat > $work/INPUT/SIS_layout << SIS_LAYOUT_EOF +#override IO_LAYOUT = $ice_io_layout +#override LAYOUT = $ice_layout +#override MASKTABLE = $ice_mask_table +SIS_LAYOUT_EOF + +cat > $work/INPUT/SIS_override << SIS_OVERRIDE_EOF +#override ICE_STATS_INTERVAL = 10. +#override DO_ICEBERGS = False +#override ICE_OCEAN_STRESS_STAGGER = "C" +SIS_OVERRIDE_EOF + +cat > $work/INPUT/SIS_diurnal << SIS_diurnal_EOF +SIS_diurnal_EOF + +# IAF cycle mechanism +echo "Model year = $fyear" + +# add empty MOM_mask_table +if ( ! -e $work/INPUT/MOM_mask_table ) then + echo "0" > $work/INPUT/MOM_mask_table +endif + ]]> + + + + + + + + $(NWA12_WORLD)/nwa12_grid_75z.tar + /archive/acr/mom6_input/nwa12/nwa12_grid_75z.tar + + + + $(NWA12_WORLD)/diag_dz.nc + + + + $(NWA12_WORLD)/ocean_static.nc + + + + + + + + + $(NWA12_WORLD)/MOM_inputs/2024_03/MOM_input + /home/Andrew.C.Ross/git/nwa-xml/NWA12/MOM_inputs/2023_10/MOM_input + + $(NWA12_WORLD)/bgc/2023-04/bgc_woa.nc + $(NWA12_WORLD)/bgc/bgc_esper_1993_2022.nc + $(NWA12_WORLD)/bgc/2023-04/bgc_cobalt.nc + + $(NWA12_WORLD)/glorys/updated_2024-01/so_001.nc + $(NWA12_WORLD)/glorys/updated_2024-01/so_002.nc + $(NWA12_WORLD)/glorys/updated_2024-01/so_003.nc + $(NWA12_WORLD)/glorys/updated_2024-01/thetao_001.nc + $(NWA12_WORLD)/glorys/updated_2024-01/thetao_002.nc + $(NWA12_WORLD)/glorys/updated_2024-01/thetao_003.nc + $(NWA12_WORLD)/glorys/updated_2024-01/zos_001.nc + $(NWA12_WORLD)/glorys/updated_2024-01/zos_002.nc + $(NWA12_WORLD)/glorys/updated_2024-01/zos_003.nc + $(NWA12_WORLD)/glorys/updated_2024-01/uv_001.nc + $(NWA12_WORLD)/glorys/updated_2024-01/uv_002.nc + $(NWA12_WORLD)/glorys/updated_2024-01/uv_003.nc + + $(NWA12_WORLD)/bgc/2023-04/RiverNutrients_Integrated_NWA12_GLOFAS_RC4US1990to2022_2023_04_v2.nc + + $(NWA12_WORLD)/tides/updated_2024-01/tu_001.nc + $(NWA12_WORLD)/tides/updated_2024-01/tu_002.nc + $(NWA12_WORLD)/tides/updated_2024-01/tu_003.nc + $(NWA12_WORLD)/tides/updated_2024-01/tz_001.nc + $(NWA12_WORLD)/tides/updated_2024-01/tz_002.nc + $(NWA12_WORLD)/tides/updated_2024-01/tz_003.nc + + + + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drydust_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetdust_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_dryfe_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetfe_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynh4_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnh4_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_drynoy_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/esm4_deposition/esm4_wetnoy_climo_1993-2014.nc + /gpfs/f5/gfdl_med/world-shared/global/co2/mole_fraction_of_co2_extended_ssp245.nc + + + + + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_msl_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_t2m_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sphum_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_strd_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_ssrd_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_lp_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_sf_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_u10_${fyear}_padded.nc + /gpfs/f5/gfdl_med/world-shared/northwest_atlantic/era5/ERA5_v10_${fyear}_padded.nc + $(NWA12_WORLD)/glofas/2023_04_v2/glofas_runoff_${fyear}.nc + + + + $(NWA12_WORLD)/chl/seawifs-clim-1997-2010.nwa12.nc + + + output_directory = './' + input_filename = '$restart_flag' + restart_input_dir = 'INPUT/' + restart_output_dir = 'RESTART/' + parameter_filename = 'INPUT/MOM_input','INPUT/MOM_layout','INPUT/MOM_override' + + + + + + + + $(NWA12_WORLD)/MOM_inputs/2023_04/SIS_input + /home/Andrew.C.Ross/git/nwa-xml/NWA12/MOM_inputs/2023_04/SIS_input + + + output_directory = './' + input_filename = '$restart_flag' + restart_input_dir = 'INPUT/' + restart_output_dir = 'RESTART/' + parameter_filename = 'INPUT/SIS_input','INPUT/SIS_layout','INPUT/SIS_override' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + tos tob ssh sshmin sshmax + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/xmls/NWA12/diag_tables/diag_table_COBALT_neus b/xmls/NWA12/diag_tables/diag_table_COBALT_neus index 5cd53af60..e106479f4 100644 --- a/xmls/NWA12/diag_tables/diag_table_COBALT_neus +++ b/xmls/NWA12/diag_tables/diag_table_COBALT_neus @@ -1,65 +1,65 @@ "ocean_cobalt_neus", 1, "days", 1, "days", "time" # 2D -"generic_cobalt", "pp", "pp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "o2os", "o2os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "o2satos", "o2satos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "no3os", "no3os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "nh4os", "nh4os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "po4os", "po4os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "dfeos", "dfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sios", "sios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chlos", "chlos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chldiatos", "chldiatos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chldiazos", "chldiazos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chlpicoos", "chlpicoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chlmiscos", "chlmiscos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "ponos", "ponos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "popos", "popos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "bfeos", "bfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "bsios", "bsios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phynos", "phynos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phypos", "phypos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phyfeos", "phyfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "physios", "physios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "co3os", "co3os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phos", "phos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "dissocos", "dissocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phycos", "phycos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "zoocos", "zoocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "baccos", "baccos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "detocos", "detocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "calcos", "calcos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "aragos", "aragos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phydiatos", "phydiatos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phydiazos", "phydiazos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phypicoos", "phypicoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "phymiscos", "phymiscos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "zmicroos", "zmicroos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "zmesoos", "zmesoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "talkos", "talkos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_no3lim_lgp", "sfc_no3lim_lgp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_no3lim_mdp", "sfc_no3lim_mdp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_no3lim_smp", "sfc_no3lim_smp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_irrlim_di", "sfc_irrlim_di", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_irrlim_lgp", "sfc_irrlim_lgp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_irrlim_mdp", "sfc_irrlim_mdp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "sfc_irrlim_smp", "sfc_irrlim_smp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "zsatarag", "zsatarag", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"generic_cobalt", "pp", "pp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "o2os", "o2os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "o2satos", "o2satos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "no3os", "no3os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "nh4os", "nh4os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "po4os", "po4os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "dfeos", "dfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sios", "sios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chlos", "chlos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chldiatos", "chldiatos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chldiazos", "chldiazos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chlpicoos", "chlpicoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chlmiscos", "chlmiscos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "ponos", "ponos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "popos", "popos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "bfeos", "bfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "bsios", "bsios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phynos", "phynos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phypos", "phypos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phyfeos", "phyfeos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "physios", "physios", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "co3os", "co3os", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phos", "phos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "dissocos", "dissocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phycos", "phycos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "zoocos", "zoocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "baccos", "baccos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "detocos", "detocos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "calcos", "calcos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "aragos", "aragos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phydiatos", "phydiatos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phydiazos", "phydiazos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phypicoos", "phypicoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "phymiscos", "phymiscos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "zmicroos", "zmicroos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "zmesoos", "zmesoos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "talkos", "talkos", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_no3lim_lgp", "sfc_no3lim_lgp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_no3lim_mdp", "sfc_no3lim_mdp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_no3lim_smp", "sfc_no3lim_smp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_irrlim_di", "sfc_irrlim_di", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_irrlim_lgp", "sfc_irrlim_lgp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_irrlim_mdp", "sfc_irrlim_mdp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "sfc_irrlim_smp", "sfc_irrlim_smp", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "zsatarag", "zsatarag", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 # 2D integrated -"generic_cobalt", "nsmp_100", "nsmp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "nmdp_100", "nmdp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "nlgp_100", "nlgp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "ndi_100", "ndi_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"generic_cobalt", "nsmp_100", "nsmp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "nmdp_100", "nmdp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "nlgp_100", "nlgp_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "ndi_100", "ndi_100", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 # 3D -"ocean_model", "volcello", "volcello", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "no3", "no3", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "po4", "po4", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "chl", "chl", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "o2", "o2", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "omega_arag", "omega_arag", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"generic_cobalt", "expkT", "expkT", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"ocean_model", "volcello", "volcello", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "no3", "no3", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "po4", "po4", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "chl", "chl", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "o2", "o2", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "omega_arag", "omega_arag", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"generic_cobalt", "expkT", "expkT", "ocean_cobalt_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 diff --git a/xmls/NWA12/diag_tables/diag_table_MOM6_neus b/xmls/NWA12/diag_tables/diag_table_MOM6_neus index 672386b01..c1e83ccc9 100644 --- a/xmls/NWA12/diag_tables/diag_table_MOM6_neus +++ b/xmls/NWA12/diag_tables/diag_table_MOM6_neus @@ -6,17 +6,17 @@ # (if some variables are on yh/xh and others are on yq/xq) # 2D -"ocean_model", "MLD_003", "MLD_003", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "MLD_EN1", "MLD_EN1", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "ustar", "ustar", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "rsntds", "rsntds", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"ocean_model", "MLD_003", "MLD_003", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "MLD_EN1", "MLD_EN1", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "ustar", "ustar", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "rsntds", "rsntds", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 # 3D -"ocean_model", "volcello", "volcello", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "rhopot0", "rhopot0", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "rhoinsitu", "rhoinsitu", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "thetao", "thetao", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 -"ocean_model", "so", "so", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"ocean_model", "volcello", "volcello", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "rhopot0", "rhopot0", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "rhoinsitu", "rhoinsitu", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "thetao", "thetao", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 +"ocean_model", "so", "so", "ocean_neus", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2 # 2D hourly -"ocean_model", "rsntds", "rsntds", "ocean_neus_3hr", "all", "mean", "-76.47 -64.48 34.89 45.78 0 400",2 +"ocean_model", "rsntds", "rsntds", "ocean_neus_3hr", "all", "mean", "-76.47 -64.48 34.89 45.78 -1 -1",2