Merge pull request #47 from GEOS-ESM/sanAkel-patch-1

House cleaning of configurations

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 # Anchors to prevent forgetting to update a version
 #baselibs_version: &baselibs_version v7.14.0
-#bcs_version: &bcs_version v11.1.0
+#bcs_version: &bcs_version v11.3.0
 
 orbs:
   ci: geos-esm/circleci-tools@1

MOM6_GEOSPlug/mom6_app/1440x1080/MOM_input

@@ -298,17 +298,13 @@ INIT_LAYERS_FROM_Z_FILE = True  !   [Boolean] default = False
                                 ! Z-space file on a latitude-longitude grid.
 
 ! === module MOM_initialize_layers_from_Z ===
-TEMP_SALT_Z_INIT_FILE = ""      ! default = "temp_salt_z.nc"
+TEMP_SALT_Z_INIT_FILE = "WOA18_decav_TPOTS_monthly_fulldepth_01.nc"      ! default = "temp_salt_z.nc"
                                 ! The name of the z-space input file used to initialize temperatures (T) and
                                 ! salinities (S). If T and S are not in the same file, TEMP_Z_INIT_FILE and
                                 ! SALT_Z_INIT_FILE must be set.
-TEMP_Z_INIT_FILE = "woa13_decav_ptemp_monthly_fulldepth_01.nc" ! default = ""
-                                ! The name of the z-space input file used to initialize temperatures, only.
-SALT_Z_INIT_FILE = "woa13_decav_s_monthly_fulldepth_01.nc" ! default = ""
-                                ! The name of the z-space input file used to initialize temperatures, only.
-Z_INIT_FILE_PTEMP_VAR = "ptemp_an" ! default = "ptemp"
+Z_INIT_FILE_PTEMP_VAR = "ptemp" ! default = "ptemp"
                                 ! The name of the potential temperature variable in TEMP_Z_INIT_FILE.
-Z_INIT_FILE_SALT_VAR = "s_an"   ! default = "salt"
+Z_INIT_FILE_SALT_VAR = "salt"   ! default = "salt"
                                 ! The name of the salinity variable in SALT_Z_INIT_FILE.
 Z_INIT_ALE_REMAPPING = True     !   [Boolean] default = False
                                 ! If True, then remap straight to model coordinate from file.
@@ -597,7 +593,7 @@ TKE_ITIDE_MAX = 0.1             !   [W m-2] default = 1000.0
 READ_TIDEAMP = True             !   [Boolean] default = False
                                 ! If true, read a file (given by TIDEAMP_FILE) containing the tidal amplitude
                                 ! with INT_TIDE_DISSIPATION.
-TIDEAMP_FILE = "tidal_amplitude.v20140616.nc" ! default = "tideamp.nc"
+TIDEAMP_FILE = "tidal_amplitude.v20140616.nc_newtopo_config.nc" ! default = "tideamp.nc"
                                 ! The path to the file containing the spatially varying tidal amplitudes with
                                 ! INT_TIDE_DISSIPATION.
 H2_FILE = "ocean_topog.nc"      !
@@ -611,7 +607,7 @@ H2_FILE = "ocean_topog.nc"      !
 GEOTHERMAL_SCALE = 1.0          !   [W m-2 or various] default = 0.0
                                 ! The constant geothermal heat flux, a rescaling factor for the heat flux read
                                 ! from GEOTHERMAL_FILE, or 0 to disable the geothermal heating.
-GEOTHERMAL_FILE = "geothermal_davies2013_v1.nc" ! default = ""
+GEOTHERMAL_FILE = "geothermal_davies2013_v1_newtopo_config.nc" ! default = ""
                                 ! The file from which the geothermal heating is to be read, or blank to use a
                                 ! constant heating rate.
 GEOTHERMAL_VARNAME = "geothermal_hf" ! default = "geo_heat"
@@ -676,7 +672,7 @@ PRESSURE_DEPENDENT_FRAZIL = True !   [Boolean] default = False
 VAR_PEN_SW = True               !   [Boolean] default = False
                                 ! If true, use one of the CHL_A schemes specified by OPACITY_SCHEME to determine
                                 ! the e-folding depth of incoming short wave radiation.
-CHL_FILE = "seawifs-clim-1997-2010.1440x1080.v20180328.nc" !
+CHL_FILE = "seawifs-clim-1997-2010.1440x1080.v20180328_newtopo_config.nc" !
                                 ! CHL_FILE is the file containing chl_a concentrations in the variable CHL_A. It
                                 ! is used when VAR_PEN_SW and CHL_FROM_FILE are true.
 CHL_VARNAME = "chlor_a"         ! default = "CHL_A"