Revert " update fvsetup for ladas setup and add x3dvar_ladas.input to…

… testsuites/"

This reverts commit a3f9010.

        reverting commit a3f9010

src/Applications/GEOSdas_App/fvsetup

@@ -340,7 +340,6 @@
 # 26May2017 Sienkiewicz Additions for new radiance bias correction
 # 25Jul2017 Holdaway   Added resource files associated with NGGPS FV3 tlm/adjoint, sens and svec
 # 19Jul2018 Wargan     Additions for OMPS
-# 2022,2024 sqz        Additions for LADAS 
 #-------------------------------------------------------------------------
 use Cwd qw(abs_path cwd);
 use English;
@@ -3518,8 +3517,8 @@ sub set_ldasANA {
     $ldasfdbk = 0;
     $ldas_flag = 0;
     $dflt = "n";
-    $ldashome = "${fvhome}_LDAS" ;
-    $ldashome4ens = "${fvhome}_LDAS4ens" ;
+    $ldashome = "NULL" ;
+    $ldashome4ens = "NULL" ;
 
     print "\n-------------\n";
     print   "LDAS Analysis\n";
@@ -3536,11 +3535,11 @@ sub set_ldasANA {
           $ldas_flag = 1;
       }
 
-      $ans3 = query(" LDAS HOME?  [DEFAULT: $ldashome]");
-      $ldashome = $ans3  unless blank($ans3); 
+      $ans3 = query("LDAS HOME = ${fvhome}_LDAS , full path? ", $ldashome);
+      $ldashome = $ans3 ;
 
-      $ans4 = query(" LDAS HOME for atmens? [DEFAULT: $ldashome4ens]");
-      $ldashome4ens = $ans4  unless blank($ans4); 
+      $ans4 = query("LDAS HOME for land ensemble = ${fvhome}_LDAS/run/atmens, full path? ", $ldashome4ens);
+      $ldashome4ens = $ans4 ;
 
    } 
 return 0;
@@ -4488,20 +4487,28 @@ sub get_history {
         $g5hist_rc = query("  Which template?", $g5hist_rc);
     }
 
-    # check that HISTORY.rc.tmpl has collections needed by LDAS
+    # verify that HISTORY.rc.tmpl has collections needed by LDAS
     #-----------------------------------------------------------
     if ( $ldas_ana == 1 ) {
-        @ldasinputs = qw / tavg1_2d_lfo_Nx+- inst1_2d_lfo_Nx+- /;
+        $verify = 0;
+        @ldasinputs = qw / tavg1_2d_lfo inst1_2d_lfo /;
         foreach $prod ( @ldasinputs ) {
             open HIST, "< $fvroot/etc/$g5hist_rc";
-            @f= grep /$prod/, <HIST>; 
             unless ( grep /$prod/, <HIST> ) {
                 print "\n  Required Land DAS inputs: @ldasinputs\n"
                     unless ($verify);
                 print "  >>> WARNING <<< $prod not defined in $g5hist_rc\n";
+                $verify = 1;
                 close HIST;
             }
         }
+        if ($verify) {
+            print "\n"
+                . "  1. Use $g5hist_rc anyway\n"
+                . "  2. Select again\n\n";
+            $ans = query("  Choose option 1 or 2:", "2");
+            return 1 unless $ans eq "1";
+        }      
     }
     print "  Using HISTORY template: $g5hist_rc\n";