Merge branch 'develop' into feature/sanAkel/update_p66_config

GEOS-ESM · Aug 16, 2023 · 8726604 · 8726604
2 parents 9c3c251 + 3c751cd
commit 8726604
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,8 +1,8 @@
 version: 2.1
 
 # Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.7.0
-bcs_version: &bcs_version v10.23.0
+#baselibs_version: &baselibs_version v7.14.0
+#bcs_version: &bcs_version v11.1.0
 
 orbs:
   ci: geos-esm/circleci-tools@1
@@ -18,8 +18,38 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
-          persist_workspace: false # Needs to be true to run fv3/gcm experiment, costs extra
+          persist_workspace: true # Needs to be true to run fv3/gcm experiment, costs extra
+
+      # Run AMIP GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
+
+      # Run Coupled GCM (1 hour, no ExtData)
+      - ci/run_gcm:
+          name: run-coupled-GCM-on-<< matrix.compiler >>
+          context:
+            - docker-hub-creds
+          matrix:
+            parameters:
+              compiler: [gfortran, ifort]
+          requires:
+            - build-GEOSgcm-on-<< matrix.compiler >>
+          repo: GEOSgcm
+          #baselibs_version: *baselibs_version
+          #bcs_version: *bcs_version
+          gcm_ocean_type: MOM6
+          change_layout: false
diff --git a/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt b/MOM6_GEOSPlug/mom6_cmake/CMakeLists.txt
@@ -75,14 +75,18 @@ list( APPEND MOM6_SRCS
    src/diagnostics/MOM_spatial_means.F90
    src/diagnostics/MOM_sum_output.F90
    src/diagnostics/MOM_wave_speed.F90
-   src/diagnostics/MOM_wave_structure.F90
    src/equation_of_state/MOM_EOS.F90
+   src/equation_of_state/MOM_EOS_Jackett06.F90
+   src/equation_of_state/MOM_EOS_Roquet_SpV.F90
+   src/equation_of_state/MOM_EOS_Roquet_rho.F90
    src/equation_of_state/MOM_EOS_linear.F90
-   src/equation_of_state/MOM_EOS_NEMO.F90
    src/equation_of_state/MOM_EOS_TEOS10.F90
    src/equation_of_state/MOM_EOS_UNESCO.F90
    src/equation_of_state/MOM_EOS_Wright.F90
+   src/equation_of_state/MOM_EOS_Wright_full.F90
+   src/equation_of_state/MOM_EOS_Wright_red.F90
    src/equation_of_state/MOM_TFreeze.F90
+   src/equation_of_state/MOM_temperature_convert.F90
 #  src/equation_of_state/TEOS10/gsw_chem_potential_water_t_exact.f90
 #  src/equation_of_state/TEOS10/gsw_ct_freezing_exact.f90
 #  src/equation_of_state/TEOS10/gsw_ct_freezing_poly.f90
@@ -172,6 +176,7 @@ list( APPEND MOM6_SRCS
    src/parameterizations/lateral/MOM_thickness_diffuse.F90
    src/parameterizations/lateral/MOM_spherical_harmonics.F90
    src/parameterizations/lateral/MOM_tidal_forcing.F90
+   src/parameterizations/lateral/MOM_Zanna_Bolton.F90
    src/parameterizations/vertical/MOM_ALE_sponge.F90
    src/parameterizations/vertical/MOM_bkgnd_mixing.F90
    src/parameterizations/vertical/MOM_bulk_mixed_layer.F90