Small Mars testing updates for looking at diurnal cycle.

ExeClim · Dec 5, 2024 · 686b071 · 686b071
1 parent f8b6d2f
commit 686b071
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 21 deletions.
diff --git a/exp/grey_mars/grey_mars.py b/exp/grey_mars/grey_mars.py
@@ -28,6 +28,7 @@
 diag.add_file('atmos_daily',88440 , 'seconds', time_units='days')
 #diag.add_file('atmos_e_daily',1 , 'days', time_units='days')
 #diag.add_file('atmos_timestep', 240, 'seconds', time_units='days')
+diag.add_file('atmos_2_hourly', 7370 , 'seconds', time_units='days')
 
 # Define diag table entries
 diag.add_field('dynamics', 'ps', time_avg=True)
@@ -213,9 +214,9 @@
 
 if __name__=="__main__":
 
-    conv_schemes = ['none']
+    conv_schemes = ['none', 'dry']
 
-    depths = [2.]
+    depths = [0.1, 0.5, 1.0]
 
     pers = [70.85]
 
@@ -237,9 +238,12 @@
                 exp.namelist['mixed_layer_nml']['depth'] = depth_val
                 exp.namelist['astronomy_nml']['per'] = per_value
 
-#            with exp_progress(exp, description='o%.0f d{day}' % scale):
-                exp.run(1, use_restart=False, num_cores=NCORES)
-                for i in range(2, 241):
-#                with exp_progress(exp, description='o%.0f d{day}' % scale):
-                    exp.run(i, num_cores=NCORES)
-                # notify('top down with conv scheme = '+conv+' has completed', 'isca')
+                try:
+    #            with exp_progress(exp, description='o%.0f d{day}' % scale):
+                    exp.run(1, use_restart=False, num_cores=NCORES)
+                    for i in range(2, 65):
+    #                with exp_progress(exp, description='o%.0f d{day}' % scale):
+                        exp.run(i, num_cores=NCORES)
+                    # notify('top down with conv scheme = '+conv+' has completed', 'isca')
+                except:
+                    pass
diff --git a/exp/socrates_mars/socrates_mars_with_mola.py b/exp/socrates_mars/socrates_mars_with_mola.py
@@ -5,7 +5,7 @@
 # from ntfy import notify
 import os
 
-NCORES = 32
+NCORES = 16
 base_dir = os.path.dirname(os.path.realpath(__file__))
 
 # a CodeBase can be a directory on the computer,
@@ -32,6 +32,7 @@
 diag.add_file('atmos_daily',88440 , 'seconds', time_units='days')
 #diag.add_file('atmos_e_daily',1 , 'days', time_units='days')
 #diag.add_file('atmos_timestep', 240, 'seconds', time_units='days')
+diag.add_file('atmos_2_hourly', 7370 , 'seconds', time_units='days')
 
 # Define diag table entries
 diag.add_field('dynamics', 'ps', time_avg=True)
@@ -67,8 +68,8 @@
 namelist = Namelist({
     'main_nml': {
         'dt_atmos': 110,
-        'days': 0.,
-        'seconds': 30.*88440.,
+        'days': 0,
+        'seconds': 30*88440,
         'calendar': 'no_calendar'
     },
 
@@ -140,7 +141,7 @@
     'sat_vapor_pres_nml': {
         'do_simple':True,
         'tcmin':  -223, #Make sure low temperature limit of saturation vapour pressure is low enough that it doesn't cause an error (note that this giant planet has no moisture anyway, so doesn't directly affect calculation.        
-        'tcmax': 350.,
+        'tcmax': 350,
     },
 
     'damping_driver_nml': {
@@ -270,8 +271,8 @@
                 exp.namelist['astronomy_nml']['per'] = per_value
 
 #            with exp_progress(exp, description='o%.0f d{day}' % scale):
-                exp.run(1, use_restart=False, num_cores=NCORES)
-                for i in range(2, 241):
+                exp.run(113, use_restart=False, num_cores=NCORES, restart_file='/home/links/sit204/Isca/exp/socrates_mars/input/res0112.tar.gz')
+                for i in range(114, 241):
 #                with exp_progress(exp, description='o%.0f d{day}' % scale):
                     exp.run(i, num_cores=NCORES)
                 # notify('top down with conv scheme = '+conv+' has completed', 'isca')
diff --git a/postprocessing/plevel_interpolation/exec/.plev.x.cppdefs b/postprocessing/plevel_interpolation/exec/.plev.x.cppdefs
@@ -1 +1 @@
-  use_netCDF
+ use_netCDF 
diff --git a/postprocessing/plevel_interpolation/scripts/run_plevel.py b/postprocessing/plevel_interpolation/scripts/run_plevel.py
@@ -7,12 +7,13 @@
 import subprocess
 
 start_time=time.time()
-base_dir='/disca/share/sit204/data_from_isca_cpu/cssp_perturb_exps/anoms/'
+# base_dir='/disca/share/sit204/data_from_isca_cpu/cssp_perturb_exps/anoms/'
+base_dir = os.environ['GFDL_DATA']
 #exp_name_list = ['soc_ga3_files_smooth_topo_fftw_mk1_fresh_compile_long', 'soc_ga3_files_smooth_topo_old_fft_mk2_long']
-exp_name_list = [f'soc_ga3_do_simple_false_cmip_o3_bucket_perturbed_ens_{f}' for f in range(100, 200)]
-avg_or_daily_list=['monthly']
-start_file=1
-end_file=1
+exp_name_list = ['ml_test_with_ml_full_sd_mean_clim_half_month']
+avg_or_daily_list=['half_monthly']
+start_file=133
+end_file=134
 nfiles=(end_file-start_file)+1
 
 do_extra_averaging=False #If true, then 6hourly data is averaged into daily data using cdo
@@ -33,6 +34,8 @@
 
     plevs['monthly']=' -p "3 16 51 138 324 676 1000 1266 2162 3407 5014 6957 9185 10000 11627 14210 16864 19534 20000 22181 24783 27331 29830 32290 34731 37173 39637 42147 44725 47391 50164 53061 56100 59295 62661 66211 70000 73915 78095 82510 85000 87175 92104 97312"'
 
+    plevs['half_monthly']=' -p "3 16 51 138 324 676 1000 1266 2162 3407 5014 6957 9185 10000 11627 14210 16864 19534 20000 22181 24783 27331 29830 32290 34731 37173 39637 42147 44725 47391 50164 53061 56100 59295 62661 66211 70000 73915 78095 82510 85000 87175 92104 97312"'
+
     plevs['timestep']=' -p "3 16 51 138 324 676 1000 1266 2162 3407 5014 6957 9185 10000 11627 14210 16864 19534 20000 22181 24783 27331 29830 32290 34731 37173 39637 42147 44725 47391 50164 53061 56100 59295 62661 66211 70000 73915 78095 82510 85000 87175 92104 97312"'
 
     plevs['pentad']=' -p "3 16 51 138 324 676 1000 1266 2162 3407 5014 6957 9185 10000 11627 14210 16864 19534 20000 22181 24783 27331 29830 32290 34731 37173 39637 42147 44725 47391 50164 53061 56100 59295 62661 66211 70000 73915 78095 82510 85000 87175 92104 97312"'
@@ -41,6 +44,7 @@
     plevs['daily']  =' -p "1000 10000 25000 50000 85000 92500"'
 
     var_names['monthly']='-a slp height'
+    var_names['half_monthly']='-a slp height'
     var_names['pentad']='-a slp height'    
     var_names['timestep']='-a'
     var_names['6hourly']='ucomp slp height vor t_surf vcomp omega'

diff --git a/src/atmos_spectral/driver/solo/idealized_moist_phys.F90 b/src/atmos_spectral/driver/solo/idealized_moist_phys.F90
@@ -173,7 +173,7 @@ module idealized_moist_phys_mod
                                       gp_surface, convection_scheme,                 &
                                       bucket, init_bucket_depth, init_bucket_depth_land, &
                                       max_bucket_depth_land, robert_bucket, raw_bucket, &
-                                      do_socrates_radiation, do_lcl_diffusivity_depth, damping_coeff_bucket, &
+                                      do_lscale_cond, do_socrates_radiation, do_lcl_diffusivity_depth, damping_coeff_bucket, &
                                       finite_bucket_depth_over_land, &
                                       do_local_heating