Changeset 5159 for LMDZ6/branches/Amaury_dev/libf/grid

Timestamp:

Aug 2, 2024, 9:58:25 PM (7 weeks ago)

Author:

abarral

Message:

Put dimensions.h and paramet.h into modules

Location:

LMDZ6/branches/Amaury_dev/libf/grid

Files:

• dimension/makdim (modified) (4 diffs)
• lmdz_fxy_new.f90 (modified) (1 diff)
• lmdz_fxy_prim.f90 (modified) (1 diff)
• lmdz_fxy_reg.f90 (modified) (1 diff)
• lmdz_fxy_sin.f90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/grid/dimension/makdim

@@ -1 +1 @@
 #!/bin/bash
-#set -xv
+set -eu
 
 # sanity check: do we have the required argument ?
-if (( $# < 1 )) || (( $# > 3 ))
-then
+if (( $# < 1 )) || (( $# > 3 )); then
     echo "Wrong number of parameters in $0 !!!"
     echo " Usage:"
@@ -12 +11 @@
 fi
 
-if ( (( $1 % 8 != 0 )) && (( $# == 3 )) || (( $1 == 1 )) )
-then
+if ( (( $1 % 8 != 0 )) && (( $# == 3 )) || (( $1 == 1 )) ); then
     echo "The number of longitudes must be a multiple of 8."
     echo "See the files dyn3d/groupe.F and dyn3dmem/groupe_loc.F."
@@ -20 +18 @@
 
 # build "fichnom", the relevant 'dimensions.im.jm.lm' file name
-for i in $*
-do
-    list=$list.$i
-done
+list=""
+for i in "$@"; do list=$list.$i; done
 fichdim=dimensions${list}
 
-if [ ! -f $fichdim ]
-then
-#    echo "$fichdim does not exist"
-
+if [[ ! -f $fichdim ]]; then
     # assign values of im, jm and lm
-    if [ $# -ge 3 ]
-    then
+    if [ $# -ge 3 ]; then
         im=$1
         jm=$2
         lm=$3
         ndm=1
-    elif [ $# -ge 2 ]
-    then
+    elif [ $# -ge 2 ]; then
         im=1
         jm=$1
         lm=$2
         ndm=1
-    elif [ $# -ge 1 ]
-    then
+    elif [ $# -ge 1 ]; then
         im=1
         jm=1
@@ -52 +42 @@
 
 # since the file doesn't exist, we create it
-    cat << EOF > $fichdim
-!-----------------------------------------------------------------------
-!   INCLUDE 'dimensions.h'
+    cat << EOF > "$fichdim"
+! This module was automatically generated during the installation of LMDZ
+! It contains the spatial resolution of the model
 
-!   dimensions.h contient les dimensions du modele
-!   ndm est tel que iim=2**ndm
-!-----------------------------------------------------------------------
+MODULE lmdz_dimensions
+  IMPLICIT NONE; PRIVATE
+  PUBLIC iim, jjm, llm, ndm
+  ! ndm is computed such that iim=2**ndm
 
-      INTEGER iim,jjm,llm,ndm
-
-      PARAMETER (iim= $im,jjm=$jm,llm=$lm,ndm=$ndm)
-
-!-----------------------------------------------------------------------
+  INTEGER, PARAMETER :: iim = $im, jjm = $jm, llm = $lm, ndm = $ndm
+END MODULE lmdz_dimensions
 EOF
-
 fi
 
-# remove 'old' dimensions.h file (if any) and replace it with new one
-if [ -f ../dimensions.h ] ; then
-    \rm ../dimensions.h
+# remove 'old' lmdz_dimensions.f90 file (if any) and replace it with new one
+if [[ -f ../lmdz_dimensions.f90 ]]; then
+    rm ../lmdz_dimensions.f90
 fi
-tar cf - $fichdim | ( cd .. ; tar xf - ; mv $fichdim dimensions.h )
-# line above is a trick to preserve time of creation of dimensions.h files
+tar cf - "$fichdim" | ( cd .. ; tar xf - ; mv "$fichdim" lmdz_dimensions.f90 )
+# line above is a trick to preserve time of creation of lmdz_dimensions.f90 files

LMDZ6/branches/Amaury_dev/libf/grid/lmdz_fxy_new.f90

@@ -4 +4 @@
   USE comconst_mod, ONLY: pi
   USE serre_mod, ONLY: pxo, pyo, alphax, alphay, transx, transy
+  USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
+  USE lmdz_paramet
   IMPLICIT NONE; PRIVATE
   PUBLIC fx, fxprim, fy, fyprim
-  INCLUDE "dimensions.h"
-  INCLUDE "paramet.h"
+
+
 CONTAINS
   REAL FUNCTION ripx(ri)

LMDZ6/branches/Amaury_dev/libf/grid/lmdz_fxy_prim.f90

@@ -3 +3 @@
 MODULE lmdz_fxy_prim
   USE comconst_mod, ONLY: pi
+  USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
   IMPLICIT NONE; PRIVATE
   PUBLIC fx, fxprim, fy, fyprim
-  INCLUDE "dimensions.h"
+
 CONTAINS
 

LMDZ6/branches/Amaury_dev/libf/grid/lmdz_fxy_reg.f90

@@ -3 +3 @@
 MODULE lmdz_fxy_reg
   USE comconst_mod, ONLY: pi
+  USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
   IMPLICIT NONE; PRIVATE
   PUBLIC fx, fxprim, fy, fyprim
-  INCLUDE "dimensions.h"
+
 CONTAINS
 

LMDZ6/branches/Amaury_dev/libf/grid/lmdz_fxy_sin.f90

@@ -3 +3 @@
 MODULE lmdz_fxy_sin
   USE comconst_mod, ONLY: pi
+  USE lmdz_dimensions, ONLY: iim, jjm, llm, ndm
   IMPLICIT NONE; PRIVATE
   PUBLIC fx, fxprim, fy, fyprim
-  INCLUDE "dimensions.h"
+
 CONTAINS