Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed

- Fixed error from MAPL's ApplicationSupport.F90 to init UDUNITS

### Removed

### Deprecated
Expand Down
14 changes: 7 additions & 7 deletions GEOSldas_App/lenkf_j_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,8 @@

source $GEOSBIN/g5_modules

setenv BASEBIN ${{BASEDIR}}/Linux/bin

setenv MPI_STACK {DETECTED_MPI_STACK}

if ( ${{MPI_STACK}} == "openmpi" ) then
Expand Down Expand Up @@ -103,8 +105,6 @@
# reversed sequence for LADAS_COUPLING (Sep 2020) (needed when coupling with ADAS using different BASEDIR)
setenv LD_LIBRARY_PATH ${{BASEDIR}}/${{ARCH}}/lib:${{ESMADIR}}/lib:${{LD_LIBRARY_PATH}}

module load nco

setenv RUN_CMD "$GEOSBIN/esma_mpirun -np "

#######################################################################
Expand Down Expand Up @@ -602,9 +602,9 @@

sed -i -e "s/NT/$LEN_SUB/g" timestamp.cdl
sed -i -e "s/DATAVALUES/$tstep2/g" timestamp.cdl
ncgen -k4 -o timestamp.nc4 timestamp.cdl
ncrcat -h $EXPID.$ThisCol.${{YYYY}}${{MM}}${{DD}}_* ${{EXPID}}.${{ThisCol}}.$YYYY$MM$DD.nc4
ncks -4 -h -v time_stamp timestamp.nc4 -A ${{EXPID}}.${{ThisCol}}.$YYYY$MM$DD.nc4
$BASEBIN/ncgen -k4 -o timestamp.nc4 timestamp.cdl
$BASEBIN/ncrcat -h $EXPID.$ThisCol.${{YYYY}}${{MM}}${{DD}}_* ${{EXPID}}.${{ThisCol}}.$YYYY$MM$DD.nc4
$BASEBIN/ncks -4 -h -v time_stamp timestamp.nc4 -A ${{EXPID}}.${{ThisCol}}.$YYYY$MM$DD.nc4
/bin/rm timestamp.cdl
/bin/rm timestamp.nc4
# rudimentary check for desired nc4 file; if ok, delete sub-daily files
Expand Down Expand Up @@ -745,7 +745,7 @@
set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_internal_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
# copy generic restart file to final location/name but remove lat/lon variables
# (lat/lon variables are not correct when running in EASE-grid tile space)
ncks -4 -O -C -x -v lat,lon ${{rstf}}${{ENSID}}_internal_checkpoint $tmp_file
$BASEBIN/ncks -4 -O -C -x -v lat,lon ${{rstf}}${{ENSID}}_internal_checkpoint $tmp_file
/bin/rm -f ${{rstf}}${{ENSID}}_internal_checkpoint
set old_rst = `/usr/bin/readlink -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst`
/bin/rm -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst
Expand Down Expand Up @@ -777,7 +777,7 @@
set TM = `echo $ThisTime | cut -c5-6`
set THISDIR = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{TY}}/M${{TM}}/
if (! -e $THISDIR ) mkdir -p $THISDIR
(ncks -4 -O -C -x -v lat,lon $rfile ${{THISDIR}}${{EXPID}}.landpert_internal_rst.${{ThisTime}}.nc4;\\
($BASEBIN/ncks -4 -O -C -x -v lat,lon $rfile ${{THISDIR}}${{EXPID}}.landpert_internal_rst.${{ThisTime}}.nc4;\\
/usr/bin/gzip ${{THISDIR}}${{EXPID}}.landpert_internal_rst.${{ThisTime}}.nc4; \\
/bin/rm -f $rfile) &
end
Expand Down