From 10d9b8ac63d7aaf6002990df6235118e3a4c059f Mon Sep 17 00:00:00 2001
From: Weiyuan Jiang <weiyuan.jiang@nasa.gov>
Date: Mon, 6 May 2024 10:15:20 -0400
Subject: [PATCH] change EXPDIR to absolute path

---
 CHANGELOG.md                     |  2 ++
 GEOSldas_App/ldas_setup          | 26 +++++++++++---------------
 GEOSldas_App/lenkf_j_template.py |  2 +-
 3 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 478eb22..6d4a2d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- Changed EXPDIR to absolute path for POSTPROC_HIST>0 option to work
+
 ### Removed
 
 - Remove restart options F and G
diff --git a/GEOSldas_App/ldas_setup b/GEOSldas_App/ldas_setup
index a49cf5e..d977683 100755
--- a/GEOSldas_App/ldas_setup
+++ b/GEOSldas_App/ldas_setup
@@ -91,8 +91,9 @@ class LDASsetup:
         # Instance variables
         self.exeinpfile = cmdLineArgs['exeinpfile']
         self.batinpfile = cmdLineArgs['batinpfile']
-        self.exphome = cmdLineArgs['exphome'].rstrip('/')
-        assert os.path.isdir(self.exphome) # exphome should exist
+        exphome_ = cmdLineArgs['exphome'].rstrip('/')
+        assert os.path.isdir(exphome_) # exphome should exist
+        self.exphome = os.path.abspath(exphome_)
         self.verbose = cmdLineArgs['verbose']
         self.runmodel = cmdLineArgs['runmodel']
         if self.runmodel :
@@ -507,21 +508,17 @@ class LDASsetup:
         tmp_execfyl= self.blddir+exefyl
         assert os.path.isfile(tmp_execfyl),\
             'Executable [%s] does not exist!' % tmp_execfyl
-        tmp_expid = self.rqdExeInp['EXP_ID']
-        tmp_expdir = os.path.abspath(self.exphome + '/' + self.rqdExeInp['EXP_ID'])
-        self.rundir = tmp_expdir + '/run'
-        self.inpdir = tmp_expdir + '/input'
-        self.outdir = tmp_expdir + '/output'
-        self.scratchdir = tmp_expdir + '/scratch'
-        self.blddirLn = tmp_expdir + '/build'
+        self.expdir = self.exphome + '/' + self.rqdExeInp['EXP_ID']
+        self.rundir = self.expdir + '/run'
+        self.inpdir = self.expdir + '/input'
+        self.outdir = self.expdir + '/output'
+        self.scratchdir = self.expdir + '/scratch'
+        self.blddirLn = self.expdir + '/build'
         self.out_path = self.outdir+'/'+self.rqdExeInp['EXP_DOMAIN']
         self.bcsdir = self.outdir+'/'+self.rqdExeInp['EXP_DOMAIN']+'/rc_out/'
         self.rstdir = self.outdir+'/'+self.rqdExeInp['EXP_DOMAIN']+'/rs/'
         self.exefyl = self.blddirLn+exefyl
 
-        tmp_expid = None
-        tmp_expdir = None
-
         my_ntasks_per_node = int(self.rqdRmInp['ntasks-per-node'])
 
         # default number of nodes
@@ -1385,15 +1382,14 @@ class LDASsetup:
                   MY_LADAS_COUPLING  = str(self.ladas_coupling),
                   MY_ENSEMBLE_FORCING= self.rqdExeInp.get('ENSEMBLE_FORCING', 'NO').upper(),
                   MY_ADAS_EXPDIR     = self.adas_expdir,
-                  MY_EXPDIR          = self.exphome + '/' + self.rqdExeInp['EXP_ID']
+                  MY_EXPDIR          = self.expdir
                   )
 
         with open('lenkf.j','wt') as fout :
            fout.write(lenkf_str)
         sp.call(['chmod', '755', 'lenkf.j'])
 
-        expdir = '/'.join(self.rundir.rstrip('/').split('/')[:-1])
-        print ('\nExperiment directory: %s' % expdir)
+        print ('\nExperiment directory: %s' % self.expdir)
         print ()
         status = True
         return status
diff --git a/GEOSldas_App/lenkf_j_template.py b/GEOSldas_App/lenkf_j_template.py
index b07e269..e004c67 100644
--- a/GEOSldas_App/lenkf_j_template.py
+++ b/GEOSldas_App/lenkf_j_template.py
@@ -652,8 +652,8 @@
              continue
           endif
        end # each collection
+       cd $PWD
      end # each month
-     cd $PWD
    endif # POSTPROC_HIST > 0
    
    #######################################################################