Changeset 3208


Ignore:
Timestamp:
Aug 27, 2018 1:10:50 PM (3 years ago)
Author:
sward
Message:

Renamed nav_mesh to agent_preprocessing and added it to palmbuild

Location:
palm/trunk
Files:
1 deleted
2 edited
1 copied
1 moved

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/palmbuild

    r3033 r3208  
    2727# -----------------
    2828# $Id$
     29# Added building of agent_preprocessing
     30#
     31# 3033 2018-05-23 15:26:19Z raasch
    2932# "fname" renamed to "jobname"
    3033#
     
    479482 cp -p  ../UTIL/combine_plot_fields.f90  .
    480483 cp -p  ../UTIL/compare_palm_logs.f90  .
     484 cp -p  ../UTIL/agent_preprocessing/agent_preprocessing.f90  .
    481485 cp -p  ../UTIL/Makefile_utilities  .
    482486 tar -cf  ${program_name}_sources.tar  Makefile*  *.$suf
    483  rm  combine_plot_fields.f90  compare_palm_logs.f90 Makefile_utilities
     487 rm  combine_plot_fields.f90  compare_palm_logs.f90 agent_preprocessing.f90 Makefile_utilities
    484488
    485489
     
    564568          fi
    565569       fi
     570       mv agent_preprocessing $source_path/../SCRIPTS/.
    566571
    567572
     
    758763       fi
    759764       make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
     765       mv agent_preprocessing $source_path/../SCRIPTS/.
    760766
    761767
  • palm/trunk/UTIL/Makefile_utilities

    r2718 r3208  
    2323# -----------------
    2424# $Id$
     25# Added make directive for agent_preprocessing tool
     26#
     27# 2718 2018-01-02 08:49:38Z maronga
    2528# Corrected "Former revisions" section
    2629#
     
    5053PROG1 =  combine_plot_fields.x
    5154PROG2 =  compare_palm_logs.x
     55PROG3 =  agent_preprocessing
    5256
    5357OBJS1 =  combine_plot_fields.o
    5458OBJS2 =  compare_palm_logs.o
     59OBJS3 =  agent_preprocessing.o
    5560
    5661CC = cc
  • palm/trunk/UTIL/agent_preprocessing/agent_preprocessing.f90

    r3207 r3208  
    1 !> @nav_mesh.f90
     1!> @agent_preprocessing.f90
    22!------------------------------------------------------------------------------!
    33! This file is part of the PALM model system.
     
    2525! -----------------!
    2626! $Id$
     27! Renamed nav_mesh to agent_preprocessing, adapted terminal output
     28!
     29! 3198 2018-08-15 09:23:10Z sward
    2730! Reduced tolerance_dp to 3 entries, fixed its initialization
    2831!
     
    507510
    508511       nc_stat = NF90_OPEN( filename, NF90_NOWRITE, id )
    509        WRITE(*,'(A,X,A)') 'Reading from file', filename
    510512
    511513       CALL handle_error( 'open_read_file', 536 )
     
    12531255                 "o----------------------------------------------o",           &
    12541256                 "| o------------------------------------------o |",           &
    1255                  "| |    o   o           o   o         o       | |",           &
    1256                  "| |    |\  |           |\ /|         |       | |",           &
    1257                  "| |    | \ |  oo o   o | o | o-o o-o o--o    | |",           &
    1258                  "| |    |  \| | |  \ /  |   | |-o  \  |  |    | |",           &
    1259                  "| |    o   o o-o-  o   o   o o-o o-o o  o    | |",           &
     1257                 "| |         __   ____  ____       ____       | |",           &
     1258                 "| |        / _\ (  _ \(_  _) ___ (  _ \      | |",           &
     1259                 "| |       /    \ ) __/  )(  (___) ) __/      | |",           &
     1260                 "| |       \_/\_/(__)   (__)      (__)        | |",           &
    12601261                 "| |                                          | |",           &
    1261                  "| |      Starting NavMesh-tool for PALM      | |",           &
     1262                 "| |    Agent Preprocessing Tool for PALM     | |",           &
    12621263                 "| o------------------------------------------o |",           &
    12631264                 "o----------------------------------------------o"
    1264 !
    1265 !--    Remove module files
    1266        CALL SYSTEM('rm -f *.mod')
    1267        WRITE(*,'((/,X,A,/))') 'Looking for input files'
     1265
    12681266!
    12691267!--    Identify run name and Input files
     
    12721270       ie = INDEX(dirname, '/', BACK=.TRUE.)
    12731271       is = INDEX(dirname(1:ie-1), '/', BACK=.TRUE.)
     1272       IF ( TRIM(ADJUSTL(dirname(ie+1:))) /= 'INPUT' ) THEN
     1273          WRITE(*,'(3X,A)') 'NavMesh was called from',                         &
     1274                            ' ', TRIM(ADJUSTL(dirname)), ' ',                  &
     1275                            'and is now aborting. Please call this tool',      &
     1276                            'from the INPUT-folder of your job directory.'
     1277          STOP
     1278       ENDIF
    12741279       runname = TRIM(ADJUSTL(dirname(is+1:ie-1)))
    12751280       rundir  = TRIM(ADJUSTL(dirname(1:ie)))
    12761281       input_trunk = TRIM(rundir)//'INPUT/'//TRIM(runname)
     1282
    12771283!
    12781284!--    Check for parameter file
Note: See TracChangeset for help on using the changeset viewer.