Changeset 3850 for dynamico_lmdz

Timestamp:

Jul 15, 2015, 1:03:42 PM (10 years ago)

Author:

ymipsl

Message:

Add XIOS output in DYNAMICO side

YM

Location:

dynamico_lmdz/aquaplanet/ICOSAGCM

Files:

• arch/arch-X64_CURIE.env (modified) (1 diff)
• arch/arch-X64_CURIE.path (modified) (1 diff)
• bld.cfg (modified) (1 diff)
• make_icosa (modified) (3 diffs)
• src/caldyn_gcm.f90 (modified) (1 diff)

dynamico_lmdz/aquaplanet/ICOSAGCM/arch/arch-X64_CURIE.env

@@ -1 +1 @@
 module unload netcdf
 module unload hdf5
-module load netcdf/4.2_hdf5_parallel
-module load  hdf5/1.8.9_parallel
+module load  netcdf/4.3.3.1_hdf5_parallel 
 module load vampir
 module load vampirtrace

dynamico_lmdz/aquaplanet/ICOSAGCM/arch/arch-X64_CURIE.path

@@ -11 +11 @@
 HDF5_LIB="-lhdf5_hl -lhdf5 -lhdf5 -lz -lcurl"
 
-XIOS_INCDIR="-I$WORKDIR/XIOS_COMMIT_V1.7/inc"
-XIOS_LIBDIR="-L$WORKDIR/XIOS_COMMIT_V1.7/lib"
+XIOS_INCDIR="-I $PWD/../XIOS/inc"
+XIOS_LIBDIR="-L $PWD/../XIOS/lib"
 XIOS_LIB="-lxios -lstdc++"
 
-IOIPSL_INCDIR="-I$WORKDIR/IOIPSL/src"
-IOIPSL_LIBDIR="-L$WORKDIR/IOIPSL/src"
+IOIPSL_INCDIR="-I $PWD/../IOIPSL/src"
+IOIPSL_LIBDIR="-L $PWD/../IOIPSL/src"
 IOIPSL_LIB="-lioipsl"

dynamico_lmdz/aquaplanet/ICOSAGCM/bld.cfg

@@ -20 +20 @@
 #bld::lib::ioipsl ioipsl
 #bld::target libioipsl.a
+
 bld::lib    icosa
 bld::target libicosa.a

dynamico_lmdz/aquaplanet/ICOSAGCM/make_icosa

@@ -1 +1 @@
 #!/bin/bash
-set -x
 export PATH=$PWD/tools/FCM/bin:$PATH
 
@@ -151 +150 @@
 if [[ "$external_ioipsl" == "TRUE" ]]
 then
-  ioipsl_path="./void_dir"
+  ioipsl_path=".void_dir"
   use_ioipsl="use::ioipsl"
   COMPIL_FFLAGS="$COMPIL_FFLAGS $IOIPSL_INCDIR"
@@ -174 +173 @@
 echo "%CPP_KEY $CPP_KEY" >> config.fcm
 echo "%LIB $ICOSA_LIB">> config.fcm
-echo "%IOIPSL_PATH $ioipls_path">> config.fcm
+echo "%IOIPSL_PATH $ioipsl_path">> config.fcm
 echo "%USE_IOIPSL $use_ioipsl">> config.fcm
 

dynamico_lmdz/aquaplanet/ICOSAGCM/src/caldyn_gcm.f90

@@ -301 +301 @@
 !       CALL write_output_fields(f_ps, f_phis, f_dps, f_u, f_theta_rhodz, f_q, &
 !            f_buf_i, f_buf_v, f_buf_u3d, f_buf_ulon, f_buf_ulat, f_buf_s, f_buf_p)
-       CALL un2ulonlat(f_u, f_buf_ulon, f_buf_ulat)
-       CALL output_field("ulon",f_buf_ulon)
-       CALL output_field("ulat",f_buf_ulat)
-
-       CALL output_field("ps",f_ps)
-       CALL output_field("dps",f_dps)
-       CALL output_field("mass",f_mass)
-       CALL output_field("dmass",f_dmass)
-       CALL output_field("vort",f_qv)
-       CALL output_field("theta",f_theta)
-       CALL output_field("exner",f_pk)
-       CALL output_field("pv",f_qv)
- 
+!       CALL un2ulonlat(f_u, f_buf_ulon, f_buf_ulat)
+!       CALL output_field("ulon",f_buf_ulon)
+!       CALL output_field("ulat",f_buf_ulat)
+
+!       CALL output_field("ps",f_ps)
+!       CALL output_field("dps",f_dps)
+!       CALL output_field("mass",f_mass)
+!       CALL output_field("dmass",f_dmass)
+!       CALL output_field("vort",f_qv)
+!       CALL output_field("theta",f_theta)
+!       CALL output_field("exner",f_pk)
+!       CALL output_field("pv",f_qv)
+! 
     END IF