diff --git a/ESM4p2/compile.yaml b/ESM4p2/compile.yaml index ee51658..eafaa81 100644 --- a/ESM4p2/compile.yaml +++ b/ESM4p2/compile.yaml @@ -44,43 +44,42 @@ compile: "https://github.com/NOAA-GFDL/ocean_BGC.git" ] branch: [ "dev/gfdl", *OCEAN_BGC_GIT_TAG ] # cant use property for mom6 since its a commit hash instead of a branch otherFlags: !join [ *FMSincludes, " ", *MOMincludes ] - additionalInstructions: | - pushd mom6/MOM6-examples - git checkout 40e3937 # this is just the value of MOM6_GIT_TAG property, can't seem to use variable - popd - # this step might be covered by initial checkout since the default is recursive - git submodule update --recursive --init mom6/MOM6-examples/src/MOM6 mom6/MOM6-examples/src/SIS2 mom6/MOM6-examples/src/icebergs - # checkout dev/gfdl on the icebergs submodule - pushd mom6/MOM6-examples/src/icebergs - git checkout dev/gfdl - popd - # this is different than the MOM6_GIT_TAG above since its pulling a submodule not the whole repo - if [[ $MOM6_GIT_FIX ]]; then - echo WARNING: Checking out MOM6_GIT_FIX, set to: $MOM6_GIT_FIX - pushd mom6/MOM6-examples/src/MOM6/ - git checkout $MOM6_GIT_FIX - popd - fi - if [[ $SIS2_GIT_FIX ]]; then - echo WARNING: Checking out SIS2_GIT_FIX, set to: $SIS2_GIT_FIX - pushd mom6/MOM6-examples/src/SIS2/ - git checkout $SIS2_GIT_FIX - popd - fi - # link in dataset - pushd mom6/MOM6-examples - # skip the check for orion - #set platform_domain = `perl -T -e "use Net::Domain(hostdomain) ; print hostdomain"` - #if ("${platform_domain}" =~ *"MsState"* ) then - # ln -s /work/noaa/gfdlscr/pdata/gfdl/gfdl_O/datasets/ .datasets - #else - ln -s /gpfs/f5/gfdl_o/world-shared/datasets .datasets - #endif - popd - test -e mom6/.datasets - if [[ $status != 0 ]]; then - echo ""; echo "" ; echo " WARNING: .datasets link in MOM6 examples directory is invalid"; echo ""; echo "" - fi + additionalInstructions: !join ["pushd mom6/MOM6-examples \n", + "git checkout", *MOM6_GIT_TAG, "\n", + "popd \n", + # this step might be covered by initial checkout since the default is recursive + "git submodule update --recursive --init mom6/MOM6-examples/src/MOM6 mom6/MOM6-examples/src/SIS2 mom6/MOM6-examples/src/icebergs \n", + # checkout dev/gfdl on the icebergs submodule + "pushd mom6/MOM6-examples/src/icebergs \n", + "git checkout dev/gfdl \n", + "popd \n", + # this is different than the MOM6_GIT_TAG above since its pulling a submodule not the whole repo + "if [[ $MOM6_GIT_FIX ]]; then \n", + " echo WARNING: Checking out MOM6_GIT_FIX, set to: $MOM6_GIT_FIX \n", + " pushd mom6/MOM6-examples/src/MOM6/ \n", + " git checkout $MOM6_GIT_FIX \n", + " popd \n", + "fi \n", + "if [[ $SIS2_GIT_FIX ]]; then \n", + " echo WARNING: Checking out SIS2_GIT_FIX, set to: $SIS2_GIT_FIX \n", + " pushd mom6/MOM6-examples/src/SIS2/ \n", + " git checkout $SIS2_GIT_FIX \n", + " popd \n", + "fi \n", + # link in dataset + "pushd mom6/MOM6-examples\n", + # skip the check for orion + #set platform_domain = `perl -T -e "use Net::Domain(hostdomain) ; print hostdomain"` + #if ("${platform_domain}" =~ *"MsState"* ) then + # ln -s /work/noaa/gfdlscr/pdata/gfdl/gfdl_O/datasets/ .datasets + #else + "ln -s /gpfs/f5/gfdl_o/world-shared/datasets .datasets \n", + #endif + "popd \n", + "test -e mom6/.datasets \n", + "if [[ $status != 0 ]]; then \n", + ' echo ""; echo "" ; echo " WARNING: .datasets link in MOM6 examples directory is invalid"; echo ""; echo "" \n', + "fi"] cppdefs: "-DMAX_FIELDS_=100 -DNOT_SET_AFFINITY -D_USE_MOM6_DIAG -D_USE_GENERIC_TRACER -DUSE_PRECISION=2" paths: [ "mom6/MOM6-examples/src/MOM6/config_src/infra/FMS2", "mom6/MOM6-examples/src/MOM6/config_src/memory/dynamic_symmetric", diff --git a/ESM4p2/esm4.yaml b/ESM4p2/esm4.yaml index a3589b0..51e8fd8 100644 --- a/ESM4p2/esm4.yaml +++ b/ESM4p2/esm4.yaml @@ -50,37 +50,16 @@ build: compileYaml: "compile.yaml" platformYaml: "../platforms.yaml" -shared: - # directories shared across tools - # shamelessly stolen from am5 example - directories: &shared_directories - history_dir: !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, history] - pp_dir: !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, pp] - analysis_dir: !join [/nbhome/$USER/, *FRE_STEM, /, *name] - ptmp_dir: "/xtmp/$USER/ptmp" - fre_analysis_home: "/home/fms/local/opt/fre-analysis/test" - - # shared pp settings - # also shamelessly stolen from am5 example - postprocess: - settings: &shared_settings - history_segment: "P1Y" - site: "ppan" - switches: &shared_switches - do_statics: True - do_timeavgs: True - clean_work: True - do_refinediag: False - do_atmos_plevel_masking: True - do_preanalysis: False - do_analysis: True - experiments: - name: "ESM4p2_piControl_spinup_J" + settings: "settings.yaml" pp: - name: "ESM4p2_piControl_spinup_Jb" + settings: "settings.yaml" pp: - name: "ESM4p2_piControl_spinup_J_redoyr450_btmdiags" + settings: "settings.yaml" pp: - name: "ESM4p2_piControl_spinup_J_redoyr450" + settings: "settings.yaml" pp: diff --git a/ESM4p2/settings.yaml b/ESM4p2/settings.yaml new file mode 100644 index 0000000..c3e6bed --- /dev/null +++ b/ESM4p2/settings.yaml @@ -0,0 +1,26 @@ +directories: + history_dir: !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, history] + pp_dir: !join [/archive/$USER/, *FRE_STEM, /, *name, /, *platform, -, *target, /, pp] + analysis_dir: !join [/nbhome/$USER/, *FRE_STEM, /, *name] + ptmp_dir: "/xtmp/$USER/ptmp" + fre_analysis_home: "/home/fms/local/opt/fre-analysis/test" + +postprocess: + workflow: + repository: "https://github.com/NOAA-GFDL/fre-workflows" + version: "2026.01-alpha1" + settings: + history_segment: "P1Y" + site: "ppan" +# pp_chunks: +# pp_start: +# pp_stop: +# pp_grid_spec: + switches: + do_timeavgs: True + clean_work: True + do_refinediag: False + do_atmos_plevel_masking: True + do_preanalysis: False + do_analysis: True + do_analysis_only: False