bug fixes to work with 2x2.5, parallelization of

jacobian and faster calc_sensi
geoschem · Aug 24, 2023 · a2c00a6 · a2c00a6
1 parent d7255a4
commit a2c00a6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 9 deletions.
diff --git a/run_imi.sh b/run_imi.sh
@@ -3,6 +3,10 @@
 #SBATCH -N 1
 #SBATCH -n 1
 #SBATCH -o "imi_output.log"
+#SBATCH -t 0-16:00
+#SBATCH --mem=20000
+#SBATCH -t 0-16:00
+#SBATCH --mem=20000
 
 
 # This script will run the Integrated Methane Inversion (IMI) with GEOS-Chem.
@@ -197,7 +201,6 @@ cd $InversionPath
 cp $ConfigFile "${RunDirs}/config_${RunName}.yml"
 
 # Upload output to S3 if specified
-cd $InversionPath
-python src/utilities/s3_upload.py $ConfigFile
+# python src/utilities/s3_upload.py $ConfigFile
 
 exit 0
diff --git a/src/components/statevector_component/aggregation.py b/src/components/statevector_component/aggregation.py
@@ -224,7 +224,9 @@ def get_max_aggregation_level(config, sensitivities, desired_element_num):
         desired_element_num   int : desired number of state vector elements
     Returns:                  int : max gridcells per cluster
     """
-    if config["Res"] == "0.25x0.3125":
+    if config["Res"] == "2x2.5":
+        max_aggregation_level = 4 # confirm
+    elif config["Res"] == "0.25x0.3125":
         max_aggregation_level = 256
     elif config["Res"] == "0.5x0.625":
         max_aggregation_level = 64
@@ -238,7 +240,7 @@ def get_max_aggregation_level(config, sensitivities, desired_element_num):
         # if there are too few clusters then we set the max aggregation level
         # to either total_native_elements/8 or total_native_elements
         denominator = 8 if desired_element_num > 8 else 1
-        max_aggregation_level = np.ceil(len(sensitivities) / denominator)
+        max_aggregation_level = np.ceil(len(sensitivities) / denominator).astype(int)
         print(
             f"Max aggregation level set to: {max_aggregation_level} elements in a cluster"
         )
@@ -316,7 +318,10 @@ def force_native_res_pixels(config, clusters, sensitivities):
         )
         return sensitivities
 
-    if config["Res"] == "0.25x0.3125":
+    if config["Res"] == "2x2.5":
+        lat_step = 2
+        lon_step = 2.5
+    elif config["Res"] == "0.25x0.3125":
         lat_step = 0.25
         lon_step = 0.3125
     elif config["Res"] == "0.5x0.625":

diff --git a/src/components/template_component/template.sh b/src/components/template_component/template.sh
@@ -98,8 +98,6 @@ setup_template() {
 	sed -i -e "s:GEOS_0.25x0.3125\/GEOS_FP:GEOS_${native}_${RegionID}\/${metDir}:g" HEMCO_Config.rc
 	sed -i -e "s:GEOS_0.25x0.3125\/GEOS_FP:GEOS_${native}_${RegionID}\/${metDir}:g" HEMCO_Config.rc.gmao_metfields
         sed -i -e "s:\$RES:\$RES.${RegionID}:g" HEMCO_Config.rc.gmao_metfields
-    # else
-	# sed -i -e "s:GEOS_4x5:GEOS_${Res}:g" HEMCO_Config.rc
     fi
 
     # Determine length of inversion period in days

diff --git a/src/geoschem_run_scripts/submit_jacobian_simulations_array.sh b/src/geoschem_run_scripts/submit_jacobian_simulations_array.sh
@@ -4,7 +4,7 @@ echo "running {END} jacobian simulations" >> {InversionPath}/imi_output.log
 # remove error status file if present
 rm -f .error_status_file.txt
 
-sbatch --array={START}-{END} --mem $JacobianMemory \
+sbatch --array={START}-{END}%50 --mem $JacobianMemory \
 -c $JacobianCPUs \
 -t $RequestedTime \
 -p $SchedulerPartition \

diff --git a/src/write_BCs/GC_config_files/HEMCO_Config.rc b/src/write_BCs/GC_config_files/HEMCO_Config.rc
@@ -27,7 +27,7 @@
 ###############################################################################
 
 ROOT:                        /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/gcdata/ExtData/HEMCO
-METDIR:                      /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/gcdata/ExtData/GEOS_4x5/GEOS_FP
+METDIR:                      /n/holyscratch01/external_repos/GEOS-CHEM/gcgrid/gcdata/ExtData/GEOS_2x2.5/GEOS_FP
 GCAPSCENARIO:                not_used
 Logfile:                     *
 DiagnFile:                   HEMCO_Diagn.rc