Changeset 6051 for BOL

Timestamp:

Jan 23, 2026, 11:53:46 AM (37 hours ago)

Author:

fhourdin

Message:

Plein de petites corrections

Location:

BOL/Replay

Files:

• replay_clean.sh (modified) (1 diff)
• replay_equip.sh (modified) (8 diffs)

BOL/Replay/replay_clean.sh

@@ -7 +7 @@
    \rm -f dump_replay*.h dump_param.h dump_ini.h  input tmp_get_subroutine_arg  tmp_include_line  tmp_include_line*  tmp_include_line*_cpp  tmp_include_line*
 
-   for file in `grep "$replay_comment" *f90 *F90 | cut -d: -f1` ; do
+   for file in `grep "$replay_comment" *f90 *F90 dyn1d/*.[hfF]* | cut -d: -f1` ; do
       sed -i"" -e "/$replay_comment/d" $file
    done

BOL/Replay/replay_equip.sh

@@ -262 +262 @@
    line_subroutine=`cat $paramfile_ | tr '[A-Z]' '[a-z]' | sed -n -e "/subrou.*${name_min}.*(/=" | head -1 `
    tail -n +$line_subroutine $paramfile_ > ${tmp} # file starting at the subroutine instruction
-   line_return=`sed -n -e "/[Rr][Ee][Tt][Uu][Rr][Nn]/=" ${tmp} | head -1`
+   line_return=$( sed -n -e "/[Rr][Ee][Tt][Uu][Rr][Nn]/=" ${tmp} | head -1 )
    head -$line_return ${tmp} > ${tmp}2               # file containing the routine
    sed -e 's/\!.*$//' ${tmp}2 > ${tmp}3
@@ -279 +279 @@
          -after_declarations)      targeted_line=$line_last_declaration ;;
          -before_return)           targeted_line=$line_return ;;
+         -before_end)           targeted_line=$line_return ;;
          -before_end_module)       targeted_line=$line_end_module ;;
          -before_line|-after_line) linestr=`echo $1 | sed -e "s/$wtype //"` ; targeted_line=`sed -n -e "/$linestr/=" ${tmp}2` ;;
@@ -417 +418 @@
 # On nettoye les inclusions précédente dans les fichiers .f90
 if [ $nconly = false ] ; then
-   for file in `grep "$replay_comment" *.[fF]90 2> /dev/null | cut -d: -f1` ; do
+   for file in `grep "$replay_comment" *.[fF]90 dyn1d/1DUTILS.h 2> /dev/null | cut -d: -f1` ; do
       sed -i"" -e "/$replay_comment/d" $file
    done
@@ -449 +450 @@
 IMPLICIT NONE
 integer :: ifin,irec,it,rec_length_replay=0,replay_irec0=1,replay_nt=1000
-integer :: status,ncid,varid
+integer :: status,ncid,varid,size_,nrec_,status_open_netcdf
 real*4,dimension($klon,$klev) :: v2d
 real*4,dimension($klon) :: v1d
@@ -466 +467 @@
 
 cat >> call_param_replay.f90 <<eod
+
 call getin('replay_nt',replay_nt)
 call getin('replay_irec0',replay_irec0)
+inquire(unit=82,size=size_) ; nrec_=size_/rec_length_replay
+replay_nt=min(replay_nt,nrec_)
+status_open_netcdf = nf90_open("replay_in.nc", nf90_nowrite, ncid)
+
 do it=1,replay_nt
    if (replay_irec0>=0) then
@@ -477 +483 @@
    read(82,rec=irec,iostat=ifin) $varin
    if (.NOT. ifin == 0 ) stop "Fin du fichier fort.82"
-   status = nf90_open("replay_in.nc", nf90_nowrite, ncid)
-   if (status == nf90_noerr) then
+   if (status_open_netcdf == nf90_noerr) then
 eod
 
-for var in $var_2D_in $var_2D_inout ; do
-   echo "status=nf90_inq_varid(ncid,\"$var\",varid)" >> call_param_replay.f90
-   echo "status=nf90_get_var(ncid,varid,v2d,start=(/1,1,1,it/), count=(/1,1,$klev,it/))" >> call_param_replay.f90
-   echo "$var(:,1:$klev)=v2d(:,1:$klev)"  >> call_param_replay.f90
+# for var in $var_2D_in $var_2D_inout ; do
+#    echo "status=nf90_inq_varid(ncid,\"$var\",varid)" >> call_param_replay.f90
+#    echo "status=nf90_get_var(ncid,varid,v2d,start=(/1,1,1,it/), count=(/1,1,$klev,it/))" >> call_param_replay.f90
+#    echo "$var(:,1:$klev)=v2d(:,1:$klev)"  >> call_param_replay.f90
+# done
+
+var_lists_=( "$var_1D_in $var_1D_inout" "$var_2D_in $var_2D_inout" )
+for idim in 1 2 ; do
+   for var in ${var_lists_[$(($idim - 1))]} ; do
+      if [ $idim == 1 ] ; then l0= ; llen= ; varf="$var(:)" ; else l0=,1 ; llen=,$klev ; varf="$var(:,1:$klev)" ; fi
+      local_var=v${idim}d
+      cat >> call_param_replay.f90 <<......eod
+   
+      status=nf90_inq_varid(ncid,"$var",varid)
+      if (status /= nf90_noerr) then ; print*,"Reading $var",nf90_strerror(status) ; stop ; endif
+      status=nf90_get_var(ncid, varid, $local_var, start=(/1,1$l0,it/), count=(/1,1$llen,1/))
+      if (status /= nf90_noerr) then ; print*,"Reading $var",nf90_strerror(status) ; stop ; endif
+      $varf=$local_var
+......eod
 done
-
-for var in $var_1D_in $var_1D_inout ; do
-   echo "status=nf90_inq_varid(ncid,\"$var\",varid)" >> call_param_replay.f90
-   echo "status=nf90_get_var(ncid, varid, v1d, start=(/1,1,it/), count=(/1,1,it/))" >> call_param_replay.f90
-   echo "$var=v1d"  >> call_param_replay.f90
 done
+echo "endif" >>  call_param_replay.f90
 
 block_Replay0 "it == 1"          _Replay0   ""       $varinout0 >> call_param_replay.f90
@@ -499 +515 @@
 
 cat >> call_param_replay.f90 <<eod
-   end if
 enddo
+call iotd_fin
 return
 end subroutine call_param_replay
@@ -621 +637 @@
 create_dump_param_nc
 
+# For proper closing of phys.nc
+include_line "CALL iotd_fin" dyn1dredem  dyn1d/1DUTILS.h -before_return
+
 # Some cleaning
 \rm -f input tmp_get* tmp_include* tmpline*
+