Changeset 3208 for palm

Timestamp:

Aug 27, 2018 1:10:50 PM (6 years ago)

Author:

sward

Message:

Renamed nav_mesh to agent_preprocessing and added it to palmbuild

Location:

palm/trunk

Files:

• SCRIPTS/palmbuild (modified) (4 diffs)
• UTIL/Makefile_utilities (modified) (2 diffs)
• UTIL/agent_preprocessing (moved) (moved from palm/trunk/UTIL/nav_mesh)
• UTIL/agent_preprocessing/agent_preprocessing.f90 (copied) (copied from palm/trunk/UTIL/nav_mesh/nav_mesh.f90) (5 diffs)
• UTIL/agent_preprocessing/nav_mesh.f90 (deleted)

palm/trunk/SCRIPTS/palmbuild

@@ -27 +27 @@
 # -----------------
 # $Id$
+# Added building of agent_preprocessing
+# 
+# 3033 2018-05-23 15:26:19Z raasch
 # "fname" renamed to "jobname"
 # 
@@ -479 +482 @@
  cp -p  ../UTIL/combine_plot_fields.f90  .
  cp -p  ../UTIL/compare_palm_logs.f90  .
+ cp -p  ../UTIL/agent_preprocessing/agent_preprocessing.f90  .
  cp -p  ../UTIL/Makefile_utilities  .
  tar -cf  ${program_name}_sources.tar  Makefile*  *.$suf
- rm  combine_plot_fields.f90  compare_palm_logs.f90  Makefile_utilities
+ rm  combine_plot_fields.f90  compare_palm_logs.f90 agent_preprocessing.f90  Makefile_utilities
 
 
@@ -564 +568 @@
           fi
        fi
+       mv agent_preprocessing $source_path/../SCRIPTS/.
 
 
@@ -758 +763 @@
        fi
        make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
+       mv agent_preprocessing $source_path/../SCRIPTS/.
 
 

palm/trunk/UTIL/Makefile_utilities

@@ -23 +23 @@
 # -----------------
 # $Id$
+# Added make directive for agent_preprocessing tool
+# 
+# 2718 2018-01-02 08:49:38Z maronga
 # Corrected "Former revisions" section
 # 
@@ -50 +53 @@
 PROG1 =  combine_plot_fields.x
 PROG2 =  compare_palm_logs.x
+PROG3 =  agent_preprocessing
 
 OBJS1 =  combine_plot_fields.o
 OBJS2 =  compare_palm_logs.o
+OBJS3 =  agent_preprocessing.o
 
 CC = cc

palm/trunk/UTIL/agent_preprocessing/agent_preprocessing.f90

@@ -1 @@
-!> @nav_mesh.f90
+!> @agent_preprocessing.f90
 !------------------------------------------------------------------------------!
 ! This file is part of the PALM model system.
@@ -25 +25 @@
 ! -----------------!
 ! $Id$
+! Renamed nav_mesh to agent_preprocessing, adapted terminal output
+! 
+! 3198 2018-08-15 09:23:10Z sward
 ! Reduced tolerance_dp to 3 entries, fixed its initialization
 ! 
@@ -507 +510 @@
 
        nc_stat = NF90_OPEN( filename, NF90_NOWRITE, id )
-       WRITE(*,'(A,X,A)') 'Reading from file', filename
 
        CALL handle_error( 'open_read_file', 536 )
@@ -1253 +1255 @@
                  "o----------------------------------------------o",           &
                  "| o------------------------------------------o |",           &
-                 "| |    o   o           o   o         o       | |",           &
-                 "| |    |\  |           |\ /|         |       | |",           &
-                 "| |    | \ |  oo o   o | o | o-o o-o o--o    | |",           &
-                 "| |    |  \| | |  \ /  |   | |-o  \  |  |    | |",           &
-                 "| |    o   o o-o-  o   o   o o-o o-o o  o    | |",           &
+                 "| |         __   ____  ____       ____       | |",           &
+                 "| |        / _\ (  _ \(_  _) ___ (  _ \      | |",           &
+                 "| |       /    \ ) __/  )(  (___) ) __/      | |",           &
+                 "| |       \_/\_/(__)   (__)      (__)        | |",           &
                  "| |                                          | |",           &
-                 "| |      Starting NavMesh-tool for PALM      | |",           &
+                 "| |    Agent Preprocessing Tool for PALM     | |",           &
                  "| o------------------------------------------o |",           &
                  "o----------------------------------------------o"
-!
-!--    Remove module files
-       CALL SYSTEM('rm -f *.mod')
-       WRITE(*,'((/,X,A,/))') 'Looking for input files'
+
 !
 !--    Identify run name and Input files
@@ -1272 +1270 @@
        ie = INDEX(dirname, '/', BACK=.TRUE.)
        is = INDEX(dirname(1:ie-1), '/', BACK=.TRUE.)
+       IF ( TRIM(ADJUSTL(dirname(ie+1:))) /= 'INPUT' ) THEN
+          WRITE(*,'(3X,A)') 'NavMesh was called from',                         &
+                            ' ', TRIM(ADJUSTL(dirname)), ' ',                  &
+                            'and is now aborting. Please call this tool',      &
+                            'from the INPUT-folder of your job directory.'
+          STOP
+       ENDIF
        runname = TRIM(ADJUSTL(dirname(is+1:ie-1)))
        rundir  = TRIM(ADJUSTL(dirname(1:ie)))
        input_trunk = TRIM(rundir)//'INPUT/'//TRIM(runname)
+
 !
 !--    Check for parameter file