Hand-resolve merge conflicts with feature/aelakkra/m21c_preops_up2

GEOS-ESM · May 17, 2024 · 89c73a2 · 89c73a2
2 parents 1868762 + a08a306
commit 89c73a2
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/src/Applications/GEOSdas_App/edhist.pl b/src/Applications/GEOSdas_App/edhist.pl
@@ -1127,7 +1127,9 @@ sub plot_edit {
     foreach $name (@topList) {
         $name =~ s/_NCKS$//;
         next unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/
-            or $name =~ m/slv$/ or $name =~ m/p42$/;
+            or $name =~ m/slv$/ or $name =~ m/p42$/
+	    or $name =~ m/p48$/ or $name =~ m/v72$/
+	    or $name =~ m/z17$/ or $name =~ m/v73$/;
         push @new, $name;
     }
     @topList = @new;

diff --git a/src/Applications/GEOSdas_App/write_monthly_rc_arc.pl b/src/Applications/GEOSdas_App/write_monthly_rc_arc.pl
@@ -321,7 +321,9 @@ sub means_type {
 sub plots_type {
     my $name = shift;
     return unless means_type($name);
-    return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/;
+#    return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/;
+    return unless $name =~ m/Cp$/ or $name =~ m/Np$/ or $name =~ m/Nx$/
+	    or $name =~ m/p48$/ or $name =~ m/glo_L/;
     return 1;
 }
 

diff --git a/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/setup_atmens.pl b/src/Applications/NCEP_Etc/NCEP_enkf/scripts/gmao/setup_atmens.pl
@@ -246,7 +246,12 @@ sub init {
          $obsv_nx =    4; $obsv_ny =    8;
          $stat_nx =    2; $stat_ny =    2;
      } elsif ($nodename eq "cas") {
-         die "Sorry this node/resolution not set yet, aborting \n";
+         $enkf_cpus = 368;
+         $agcm_nx =    6; $agcm_ny =   24;
+         $miau_nx =    2; $miau_ny =   12;
+         $obsv_nx =    4; $obsv_ny =   24;
+         $stat_nx =    2; $stat_ny =   24;
+#         die "Sorry this node/resolution not set yet, aborting \n";
 #        $agcm_ncpus_per_node = 46;
      } else {
          die "Unknown node name, aborting \n";