Revision 0461d2e117ce88704a56dd8bcbf6bf7787991b15 authored by Eh Tan on 08 November 2007, 23:28:46 UTC, committed by Eh Tan on 08 November 2007, 23:28:46 UTC
svn+ssh://svn@geodynamics.org/cig/mc/3D/CitcomS/trunk

........
  r8194 | tan2 | 2007-10-30 14:49:58 -0700 (Tue, 30 Oct 2007) | 1 line
  
  Compute d(rho)/dr/rho from rho(r)
........
  r8195 | tan2 | 2007-10-30 14:50:52 -0700 (Tue, 30 Oct 2007) | 1 line
  
  Fixed a bug in dimensionalizing density. Provided the formula of geoid calculation in the comments. Rearranged the order of functions.
........
  r8196 | tan2 | 2007-10-30 14:53:50 -0700 (Tue, 30 Oct 2007) | 1 line
  
  A post-processing program to project geoid coefficents onto a regular (longitude, latitude) mesh
........
  r8197 | tan2 | 2007-10-30 14:54:14 -0700 (Tue, 30 Oct 2007) | 1 line
  
  Added the C program project_geoid to the makefile
........
  r8199 | tan2 | 2007-10-30 15:29:44 -0700 (Tue, 30 Oct 2007) | 1 line
  
  Minor modification
........
  r8201 | tan2 | 2007-11-01 16:33:30 -0700 (Thu, 01 Nov 2007) | 1 line
  
  Print dv/v=dp/p=1.0 for the 1st Uzawa iteraion
........
  r8202 | tan2 | 2007-11-01 16:33:50 -0700 (Thu, 01 Nov 2007) | 1 line
  
  Fixed an error in comment
........
  r8204 | tan2 | 2007-11-05 17:03:35 -0800 (Mon, 05 Nov 2007) | 1 line
  
  Scaled topo with variable gravity. Fixed an error in comment. Rearranged computation.
........
  r8205 | tan2 | 2007-11-05 17:03:55 -0800 (Mon, 05 Nov 2007) | 1 line
  
  Removed functions related sph. harm in lib/Regional_obsolete.c
........
  r8206 | tan2 | 2007-11-05 17:04:20 -0800 (Mon, 05 Nov 2007) | 1 line
  
  Shrank the size of sph. harm arrays
........
  r8207 | tan2 | 2007-11-05 17:04:43 -0800 (Mon, 05 Nov 2007) | 1 line
  
  Init'd some variables about vtk_io, which might be accessed with uninit'd values in output_finalize()
........
  r8212 | tan2 | 2007-11-06 15:17:54 -0800 (Tue, 06 Nov 2007) | 1 line
  
  Fixed a few memory errors
........
  r8213 | tan2 | 2007-11-06 15:18:12 -0800 (Tue, 06 Nov 2007) | 1 line
  
  Increase vlowstep to match the default value in pyre
........
  r8214 | tan2 | 2007-11-06 15:18:35 -0800 (Tue, 06 Nov 2007) | 1 line
  
  Removed unused multigrid parameters
........
  r8215 | tan2 | 2007-11-06 15:18:54 -0800 (Tue, 06 Nov 2007) | 1 line
  
  Added cgrad solver convergence parameters, increased buoyancy_ratio and lower the # of steps
........
  r8226 | tan2 | 2007-11-07 11:51:56 -0800 (Wed, 07 Nov 2007) | 1 line
  
  Print a warning when matrix eqn solver not converging
........
  r8227 | tan2 | 2007-11-07 11:52:17 -0800 (Wed, 07 Nov 2007) | 1 line
  
  Removed comp_el from default output, since it is not required for restart anymore.
........
  r8228 | tan2 | 2007-11-07 11:52:39 -0800 (Wed, 07 Nov 2007) | 1 line
  
  Decreased the # of processors. This is the only way I can reproduce single-cell convection as in the manual.
........
  r8235 | tan2 | 2007-11-08 11:18:26 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Dereased the timestep size to reduce artifacts in advection
........
  r8236 | tan2 | 2007-11-08 11:18:52 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Update NEWS
........
  r8237 | tan2 | 2007-11-08 11:19:12 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Update the version number
........
  r8241 | tan2 | 2007-11-08 13:17:14 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Updated file ChangeLog to r8240
........
  r8242 | tan2 | 2007-11-08 13:36:55 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Removed binary checkpoint files from makefile, as the file size is too big for distribution.
........
  r8243 | tan2 | 2007-11-08 13:38:09 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Updated file ChangeLog to r8242
........
  r8244 | tan2 | 2007-11-08 14:31:21 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Replaced a system call by std C library remove() and disabled another system call (backup input file). Partially fixed issue130. All remaining system calls are in lib/Output_gzdir.c.
........
  r8245 | tan2 | 2007-11-08 14:41:31 -0800 (Thu, 08 Nov 2007) | 1 line
  
  Updated file ChangeLog to r8244
........

1 parent a828fa9
Raw File
CitcomSImport.net.in
//
// time: Fri Jun 25 11:00:44 2004
//
// version: 3.2.0 (format), 4.3.0 (DX)
//
//
//
// macro reference (indirect): RTFtoXYZ @dxmacrodir@/RTFtoXYZ.net
//
// macro reference (direct): CitcomSTemperature @dxmacrodir@/CitcomSTemperature.net
include "CitcomSTemperature.net"
//
// macro reference (indirect): VelocityRTFtoXYZ @dxmacrodir@/VelocityRTFtoXYZ.net
//
// macro reference (direct): CitcomSVelocity @dxmacrodir@/CitcomSVelocity.net
include "CitcomSVelocity.net"
//
// macro reference (direct): CitcomSViscosity @dxmacrodir@/CitcomSViscosity.net
include "CitcomSViscosity.net"
//
// Begin MDF
// MODULE CitcomSImport
// CATEGORY Macros
// DESCRIPTION new macro
// INPUT filename; string; (no default);  
// INPUT reduced; scalar list or vector list; (no default);  
// OUTPUT velocity; field;  
// OUTPUT temperature; field;  
// OUTPUT viscosity; field; 
// End MDF
// workspace: width = 495, height = 419
// layout: snap = 0, width = 50, height = 50, align = NN
//
macro CitcomSImport(
 filename
,reduced
) -> (
 velocity
,temperature
,viscosity
) {
    // 
    // node Input[1]: x = 120, y = 0, inputs = 0, label = Input
    // parameter: position = 1, name = 'filename', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
    //
CitcomSImport_Input_1_out_1 = filename;
    // 
    // node Import[1]: x = 129, y = 102, inputs = 6, label = Import
    // input[3]: defaulting = 0, visible = 1, type = 32, value = "general"
    //
CitcomSImport_Import_1_out_1 = 
    Import(
    CitcomSImport_Input_1_out_1,
    NULL,
    "general",
    NULL,
    NULL,
    NULL
    ) [instance: 1, cache: 1];
    // 
    // node CitcomSTemperature[1]: x = 181, y = 204, inputs = 1, label = CitcomSTemperature
    //
CitcomSImport_CitcomSTemperature_1_out_1 = 
    CitcomSTemperature(
    CitcomSImport_Import_1_out_1
    ) [instance: 1, cache: 1];
    // 
    // node Input[2]: x = 43, y = 5, inputs = 0, label = Input
    // parameter: position = 2, name = 'reduced', value = '(no default)', descriptive = 1, description = ' ', required = 0, visible = 1
    //
CitcomSImport_Input_2_out_1 = reduced;
    // 
    // node CitcomSVelocity[1]: x = 0, y = 197, inputs = 2, label = CitcomSVelocity
    //
CitcomSImport_CitcomSVelocity_1_out_1 = 
    CitcomSVelocity(
    CitcomSImport_Import_1_out_1,
    CitcomSImport_Input_2_out_1
    ) [instance: 1, cache: 1];
    // 
    // node CitcomSViscosity[2]: x = 366, y = 206, inputs = 1, label = CitcomSViscosity
    //
CitcomSImport_CitcomSViscosity_2_out_1 = 
    CitcomSViscosity(
    CitcomSImport_Import_1_out_1
    ) [instance: 2, cache: 1];
    // 
    // node Output[1]: x = 230, y = 351, inputs = 1, label = Output
    // parameter: position = 2, name = 'temperature', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
    //
temperature = CitcomSImport_CitcomSTemperature_1_out_1;
    // 
    // node Output[2]: x = 33, y = 357, inputs = 1, label = Output
    // parameter: position = 1, name = 'velocity', value = ' ', descriptive = 0, description = ' ', required = 0, visible = 1
    //
velocity = CitcomSImport_CitcomSVelocity_1_out_1;
    // 
    // node Output[3]: x = 403, y = 352, inputs = 1, label = Output
    // parameter: position = 3, name = 'viscosity', value = '(NULL)', descriptive = 1, description = ' ', required = 0, visible = 1
    //
viscosity = CitcomSImport_CitcomSViscosity_2_out_1;
// network: end of macro body
}
CitcomSImport_Input_1_out_1 = NULL;
CitcomSImport_Import_1_out_1 = NULL;
CitcomSImport_CitcomSTemperature_1_out_1 = NULL;
CitcomSImport_Input_2_out_1 = NULL;
CitcomSImport_CitcomSVelocity_1_out_1 = NULL;
CitcomSImport_CitcomSViscosity_2_out_1 = NULL;
back to top