Adjust the date format fro file names

templates/real-from-d2-ana/prepare_date_remote.sh

@@ -52,9 +52,14 @@ if [ "${IC_DATA_IS_LOCAL}" != "True" ]; then
   echo "${FG_SOURCE}" > fg_file.txt
 
   # Copy the first-guess and analysis files.
-  rsync -v --file-from=an_file.txt / "${COMMON_DATE_FOLDER}"
-  rsync -v --file-from=an_inc_file.txt / "${COMMON_DATE_FOLDER}"
-  rsync -v --file-from=fg_file.txt / "${COMMON_DATE_FOLDER}"
+  #rsync -v --files-from=an_file.txt / "${COMMON_DATE_FOLDER}"
+  #rsync -v --files-from=an_inc_file.txt / "${COMMON_DATE_FOLDER}"
+  #rsync -v --files-from=fg_file.txt / "${COMMON_DATE_FOLDER}"
+
+  # Create links for the detected analysis and first-guess files
+  awk '{print $1}' an_file.txt | xargs -I[] ln -sf [] .
+  awk '{print $1}' an_inc_file.txt | xargs -I[] ln -sf [] .
+  awk '{print $1}' fg_file.txt | xargs -I[] ln -sf [] .
 
   # Change permissions to read only.
   chmod 440 ./*

templates/real-from-d2-ana/prepare_lbc_remote.sh

@@ -97,10 +97,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
   # Fetch tar.gz file of ICON-EU-EPS outputs necessary for the lateral boundary conditions
   LBC_SOURCE=$(find ${MEMBER_DIR} -name "latbc_*00.${MEMBER,}.grib" | sort -n )
 
-  LBC_FILE=$(basename "${LBC_SOURCE}")
-
-
-  if [ ! -z "${LBC_SOURCE}" ]; then
+  if [ -z "${LBC_SOURCE}" ]; then
     echo "Failed to make boundary conditions file for date ${STARTDATE}!"
     exit 1
   fi
@@ -111,7 +108,7 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
   cd ${COMMON_DATE_FOLDER} || exit
 
   # Save filenames to be used later by other scripts.
-  echo "${LBC_SOURCE}" >> lbc_file.txt
+  echo "${LBC_SOURCE}" > ${MEMBER_DIR}/lbc_file.txt
 
   # Copy the first-guess and analysis files.
   #cp "${LBC_SOURCE}" "${LBC_FILE}"
@@ -119,7 +116,5 @@ if [ "${LBC_DATA_IS_LOCAL}" != "True" ]; then
   # Change permissions to read only.
   chmod 440 ./*
 
-  # clear the working directory
-  rm -r work
 
 fi
\ No newline at end of file

templates/real-from-d2-ana/prepare_namelist.py

@@ -17,10 +17,6 @@ CHUNK = "%CHUNK%"
 RUNDIR = Path(f"{WORKDIR}/{STARTDATE}/{MEMBER}")
 ATMOSPHERE_NAMELIST_PATH = Path("%simulation.namelist_paths.atmosphere%")
 MASTER_NAMELIST_PATH = Path("%simulation.namelist_paths.master%")
-# TODO: This is a bit ugly
-# Read first-guess and analysis filenames from files:
-first_guess_filename = (RUNDIR / "fg_file.txt").read_text().strip()
-analysis_filename = (RUNDIR / "an_file.txt").read_text().strip()
 
 # Example of date format "2018-06-01T00:00:00Z"
 date_format = "%simulation.date_format%"
@@ -38,6 +34,11 @@ END_HOUR = "%Chunk_END_HOUR%"
 Chunk_START_DATE = datetime(year=int(START_YEAR), month=int(START_MONTH), day=int(START_DAY), hour=int(START_HOUR))
 Chunk_END_DATE = datetime(year=int(END_YEAR), month=int(END_MONTH), day=int(END_DAY), hour=int(END_HOUR))
 
+# Read first-guess and analysis filenames from files:
+first_guess_filename = (RUNDIR / f"fc_R19B07.{(Chunk_START_DATE-timedelta(minutes=5)).strftime('%Y%m%d%H%M')}00_an.{MEMBER[1:]}")  
+analysis_filename = (RUNDIR / f"an_R19B07.{Chunk_START_DATE.strftime('%Y%m%d%H%M')}00_an.{MEMBER[1:]}")  
+analysis_inc_filename = (RUNDIR / f"an_R19B07.{Chunk_START_DATE.strftime('%Y%m%d%H%M')}00_inc.{MEMBER[1:]}")  
+
 # Read custom namelist parameters from configuration
 atmosphere_namelist_string = """
 %atmosphere_namelist%
@@ -52,7 +53,7 @@ checkpoint_time = int((Chunk_END_DATE - Chunk_START_DATE).total_seconds())
 
 # TODO: Is that really necessary?
 # Add 10 minutes to allow the model to write the restarts
-Chunk_END_DATE = Chunk_END_DATE + timedelta(minutes=10)
+#Chunk_END_DATE = Chunk_END_DATE + timedelta(minutes=10)
 
 atmosphere_namelist_replacements = {
     "time_nml": {